Fix requires circomlibjs

nearnadokeyser · Oct 6, 2021 · 31d892d · 31d892d
1 parent 9048d32
commit 31d892d
Show file tree

Hide file tree

Showing 23 changed files with 8,388 additions and 1,033 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
   "devDependencies": {
     "chai": "^4.3.4",
     "circom_tester": "0.0.5",
-    "circomlibjs": "^0.0.6",
+    "circomlibjs": "^0.0.7",
     "eslint": "^6.8.0",
     "ganache-cli": "^6.12.1",
     "mocha": "^7.1.1",

diff --git a/test/babyjub_js.js b/test/babyjub_js.js
diff --git a/test/eddsa.js b/test/eddsa.js
@@ -3,8 +3,8 @@ const path = require("path");
 
 const tester = require("circom").tester;
 
-const eddsa = require("../src/eddsa.js");
-const babyJub = require("../src/babyjub.js");
+const eddsa = require("circomlibjs").eddsa;
+const babyJub = require("circomlibjs").babyjub;
 
 const F1Field = require("ffjavascript").F1Field;
 const Scalar = require("ffjavascript").Scalar;

diff --git a/test/eddsa_js.js b/test/eddsa_js.js
diff --git a/test/eddsamimc.js b/test/eddsamimc.js
@@ -2,7 +2,7 @@ const chai = require("chai");
 const path = require("path");
 const tester = require("circom").tester;
 
-const eddsa = require("../src/eddsa.js");
+const eddsa = require("circomlibjs").eddsa;
 const F1Field = require("ffjavascript").F1Field;
 const Scalar = require("ffjavascript").Scalar;
 exports.p = Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617");

diff --git a/test/eddsaposeidon.js b/test/eddsaposeidon.js
@@ -2,7 +2,7 @@ const chai = require("chai");
 const path = require("path");
 const tester = require("circom").tester;
 
-const eddsa = require("../src/eddsa.js");
+const eddsa = require("circomlibjs").eddsa;
 const F1Field = require("ffjavascript").F1Field;
 const Scalar = require("ffjavascript").Scalar;
 exports.p = Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617");

diff --git a/test/escalarmul.js b/test/escalarmul.js
@@ -1,7 +1,7 @@
 const chai = require("chai");
 const path = require("path");
 const tester = require("circom").tester;
-const babyJub = require("../src/babyjub.js");
+const babyJub = require("circomlibjs").babyjub;
 
 const F1Field = require("ffjavascript").F1Field;
 const Scalar = require("ffjavascript").Scalar;

diff --git a/test/escalarmulfix.js b/test/escalarmulfix.js
@@ -1,7 +1,7 @@
 const chai = require("chai");
 const path = require("path");
 const tester = require("circom").tester;
-const babyjub = require("../src/babyjub");
+const babyjub = require("circomlibjs").babyjub;
 const F1Field = require("ffjavascript").F1Field;
 const Scalar = require("ffjavascript").Scalar;
 exports.p = Scalar.fromString("21888242871839275222246405745257275088548364400416034343698204186575808495617");

diff --git a/test/mimccircuit.js b/test/mimccircuit.js
@@ -2,7 +2,7 @@ const chai = require("chai");
 const path = require("path");
 const tester = require("circom").tester;
 
-const mimcjs = require("../src/mimc7.js");
+const mimcjs = require("circomlibjs").mimc7;
 
 describe("MiMC Circuit test", function () {
     let circuit;

diff --git a/test/mimccontract.js b/test/mimccontract.js
diff --git a/test/mimcspongecircuit.js b/test/mimcspongecircuit.js
@@ -1,7 +1,7 @@
 const path = require("path");
 const tester = require("circom").tester;
 
-const mimcjs = require("../src/mimcsponge.js");
+const mimcjs = require("circomlibjs").mimcsponge;
 
 
 describe("MiMC Sponge Circuit test", function () {