Rename bodyhash to body_hash

zkemail · Oct 4, 2023 · 2de76a4 · 2de76a4
1 parent 2ca55e3
commit 2de76a4
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/...ages/circom/circuits/common/bodyhash.json → ...ges/circom/circuits/common/body_hash.json b/...ages/circom/circuits/common/bodyhash.json → ...ges/circom/circuits/common/body_hash.json
diff --git a/...com/circuits/common/bodyhash_regex.circom → ...om/circuits/common/body_hash_regex.circom b/...com/circuits/common/bodyhash_regex.circom → ...om/circuits/common/body_hash_regex.circom
@@ -2,7 +2,7 @@ pragma circom 2.1.5;
 
 include "zk-regex-circom/circuits/regex_helpers.circom";
 
-template BodyhashRegex(msg_bytes) {
+template BodyHashRegex(msg_bytes) {
 	signal input msg[msg_bytes];
 	signal output out;
 

diff --git a/packages/circom/tests/bodyhash_regex.test.ts → ...ages/circom/tests/body_hash_regex.test.ts b/packages/circom/tests/bodyhash_regex.test.ts → ...ages/circom/tests/body_hash_regex.test.ts
@@ -17,12 +17,12 @@ jest.setTimeout(120000);
 describe("Bodyhash Regex", () => {
     let circuit;
     beforeAll(async () => {
-        compiler.genFromDecomposed(path.join(__dirname, "../circuits/common/bodyhash.json"), {
-            circomFilePath: path.join(__dirname, "../circuits/common/bodyhash_regex.circom"),
-            templateName: "BodyhashRegex",
+        compiler.genFromDecomposed(path.join(__dirname, "../circuits/common/body_hash.json"), {
+            circomFilePath: path.join(__dirname, "../circuits/common/body_hash_regex.circom"),
+            templateName: "BodyHashRegex",
             genSubstrs: true
         });
-        circuit = await wasm_tester(path.join(__dirname, "./circuits/test_bodyhash_regex.circom"), option);
+        circuit = await wasm_tester(path.join(__dirname, "./circuits/test_body_hash_regex.circom"), option);
     });
 
     it("bodyhash in the header", async () => {
@@ -36,7 +36,7 @@ describe("Bodyhash Regex", () => {
         const witness = await circuit.calculateWitness(circuitInputs);
         await circuit.checkConstraints(witness);
         expect(1n).toEqual(witness[1]);
-        const prefixIdxes = apis.extractSubstrIdxes(signatureField, readFileSync(path.join(__dirname, "../circuits/common/bodyhash.json"), "utf8"))[0];
+        const prefixIdxes = apis.extractSubstrIdxes(signatureField, readFileSync(path.join(__dirname, "../circuits/common/body_hash.json"), "utf8"))[0];
         for (let idx = 0; idx < 1024; ++idx) {
             if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
                 expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);
@@ -53,11 +53,11 @@ describe("Bodyhash Regex", () => {
         const circuitInputs = {
             msg: paddedStr,
         };
-        const circuit = await wasm_tester(path.join(__dirname, "./circuits/test_bodyhash_regex.circom"), option);
+        // const circuit = await wasm_tester(path.join(__dirname, "./circuits/test_bodyhash_regex.circom"), option);
         const witness = await circuit.calculateWitness(circuitInputs);
         await circuit.checkConstraints(witness);
         expect(1n).toEqual(witness[1]);
-        const prefixIdxes = apis.extractSubstrIdxes(signatureField, readFileSync(path.join(__dirname, "../circuits/common/bodyhash.json"), "utf8"))[0];
+        const prefixIdxes = apis.extractSubstrIdxes(signatureField, readFileSync(path.join(__dirname, "../circuits/common/body_hash.json"), "utf8"))[0];
         for (let idx = 0; idx < 1024; ++idx) {
             if (idx >= prefixIdxes[0] && idx < prefixIdxes[1]) {
                 expect(BigInt(paddedStr[idx])).toEqual(witness[2 + idx]);

diff --git a/packages/circom/tests/circuits/test_body_hash_regex.circom b/packages/circom/tests/circuits/test_body_hash_regex.circom
@@ -0,0 +1,3 @@
+include "../../circuits/common/body_hash_regex.circom";
+
+component main = BodyHashRegex(1024);
diff --git a/packages/circom/tests/circuits/test_bodyhash_regex.circom b/packages/circom/tests/circuits/test_bodyhash_regex.circom