(fix) Use relative path in engine file names

Signed-off-by: Jerome Simeon <[email protected]>
accordproject · Mar 19, 2019 · f82998d · f82998d
1 parent b24c232
commit f82998d
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/ergo-cli/extracted/ergotopcore.js b/packages/ergo-cli/extracted/ergotopcore.js
diff --git a/packages/ergo-engine/test/engine.js b/packages/ergo-engine/test/engine.js
@@ -65,12 +65,12 @@ describe('Execute ES6', () => {
                 for (let i = 0; i < ergo.length; i++) {
                     const ergoFile = Path.resolve(__dirname, dir, ergo[i]);
                     const ergoContent = Fs.readFileSync(ergoFile, 'utf8');
-                    templateLogic.addLogicFile(ergoContent,ergoFile);
+                    templateLogic.addLogicFile(ergoContent, Path.join(dir, ergo[i]));
                 }
                 for (let i = 0; i < models.length; i++) {
                     const ctoFile = Path.resolve(__dirname, dir, models[i]);
                     const ctoContent = Fs.readFileSync(ctoFile, 'utf8');
-                    templateLogic.addModelFile(ctoContent,ctoFile);
+                    templateLogic.addModelFile(ctoContent, Path.join(dir, models[i]));
                 }
                 templateLogic.setContractName(contractName);
                 const contractJson = JSON.parse(Fs.readFileSync(Path.resolve(__dirname, dir, contract), 'utf8'));
@@ -157,12 +157,12 @@ describe('Execute ES5', () => {
                 for (let i = 0; i < ergo.length; i++) {
                     const ergoFile = Path.resolve(__dirname, dir, ergo[i]);
                     const ergoContent = Fs.readFileSync(ergoFile, 'utf8');
-                    templateLogic.addLogicFile(ergoContent,ergoFile);
+                    templateLogic.addLogicFile(ergoContent, Path.join(dir, ergo[i]));
                 }
                 for (let i = 0; i < models.length; i++) {
                     const ctoFile = Path.resolve(__dirname, dir, models[i]);
                     const ctoContent = Fs.readFileSync(ctoFile, 'utf8');
-                    templateLogic.addModelFile(ctoContent,ctoFile);
+                    templateLogic.addModelFile(ctoContent, Path.join(dir, models[i]));
                 }
                 const contractJson = JSON.parse(Fs.readFileSync(Path.resolve(__dirname, dir, contract), 'utf8'));
                 if (state === null) {

diff --git a/packages/ergo-engine/test/workload.json b/packages/ergo-engine/test/workload.json
@@ -118,7 +118,7 @@
     "clauseName": "helloworld",
     "currentTime": "2019-01-01T16:34:00-05:00",
     "expected": {
-      "error": "Parse error (at file /Users/jeromesimeon/git/ergo/packages/ergo-engine/test/examples/bad-logic/logic.ergo line 17 col 20). \ncontract HelloWorld ovr TemplateModel {\n                    ^^^                "
+      "error": "Parse error (at file examples/bad-logic/logic.ergo line 17 col 20). \ncontract HelloWorld ovr TemplateModel {\n                    ^^^                "
     }
   }
 ]