fix function naming, minor tests refactor

zokrates_js/build.rs

@@ -3,11 +3,11 @@ use std::{env, fs};
 use walkdir::WalkDir;
 
 fn main() {
-    export_stdlib_js();
+    export_stdlib();
     export_metadata();
 }
 
-fn export_stdlib_js() {
+fn export_stdlib() {
     let root = "../zokrates_stdlib/stdlib";
     let mut stdlib = json::JsonValue::new_object();
 

zokrates_js/tests/tests.js

@@ -245,24 +245,28 @@ describe("tests", () => {
     });
   };
 
-  describe("ark", () => {
+  let combinations = {
-    for (const scheme of ["g16", "gm17", "marlin"]) {
+    ark: {
-      describe(scheme, () => {
+      schemes: ["g16", "gm17", "marlin"],
-        for (const curve of ["bn128", "bls12_381", "bls12_377", "bw6_761"]) {
+      curves: ["bn128", "bls12_381", "bls12_377", "bw6_761"],
-          describe(curve, () =>
+    },
-            runWithOptions({ backend: "ark", scheme, curve })
+    bellman: {
-          );
+      schemes: ["g16"],
-        }
+      curves: ["bn128"],
-      });
+    },
-    }
+  };
-  });
 
-  describe("bellman", () => {
+  for (const backend of Object.keys(combinations)) {
-    describe("g16", () => {
+    describe(backend, () => {
-      describe("bn128", () =>
+      for (const scheme of combinations[backend].schemes) {
-        runWithOptions({ backend: "bellman", scheme: "g16", curve: "bn128" }));
+        describe(scheme, () => {
+          for (const curve of combinations[backend].curves) {
+            describe(curve, () => runWithOptions({ backend, scheme, curve }));
+          }
+        });
+      }
     });
-  });
+  }
 
   const testRunner = (rootPath, testPath, test) => {
     let entryPoint;