Merge branch 'main' into main

iden3 · Sep 14, 2023 · 276e29b · 276e29b
2 parents cbbd249 + a870064
commit 276e29b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 22 deletions.
diff --git a/c/tester.js b/c/tester.js
@@ -78,18 +78,16 @@ async function compile (baseName, fileName, options) {
     if (options.verbose) flags += "--verbose ";
 
     try {
-	b = await exec("circom " + flags + fileName);
-	if (options.verbose) {
+	      let b = await exec("circom " + flags + fileName);
+	      if (options.verbose) {
             console.log(b.stdout);
-	}
-
-    if (b.stderr) {
-        console.error(b.stderr);
-    }
-
+   	    }
+        if (b.stderr) {
+            console.error(b.stderr);
+        }
     } catch (e) {
-	assert(false,
-	       "circom compiler error \n" + e);
+	      assert(false,
+	             "circom compiler error \n" + e);
     }
 
     const c_folder = path.join(options.output, baseName+"_cpp/")
@@ -250,7 +248,7 @@ function check_versions ( v1, v2 ) {
 async function compiler_above_version(v) {
     let output = (await exec('circom --version')).stdout;
     let compiler_version = version_to_list(output.slice(output.search(/\d/),-1));
-    vlist = version_to_list(v);
+    let vlist = version_to_list(v);
     return check_versions ( compiler_version, vlist );
 }
 

diff --git a/wasm/tester.js b/wasm/tester.js
@@ -83,18 +83,16 @@ async function compile (fileName, options) {
     if (options.verbose) flags += "--verbose ";
 
     try {
-	b = await exec("circom " + flags + fileName);
-	if (options.verbose) {
+	      let b = await exec("circom " + flags + fileName);
+	      if (options.verbose) {
             console.log(b.stdout);
-	}
-
-    if (b.stderr) {
-        console.error(b.stderr);
-    }
-
+	      }
+        if (b.stderr) {
+            console.error(b.stderr);
+        }
     } catch (e) {
-	assert(false,
-	       "circom compiler error \n" + e);
+	      assert(false,
+	             "circom compiler error \n" + e);
     }
 }
 
@@ -238,6 +236,6 @@ function check_versions ( v1, v2 ) {
 async function compiler_above_version(v) {
     let output = (await exec('circom --version')).stdout;
     let compiler_version = version_to_list(output.slice(output.search(/\d/),-1));
-    vlist = version_to_list(v);
+    let vlist = version_to_list(v);
     return check_versions ( compiler_version, vlist );
 }