chore: run tests for noir_wasm in node under default resolver (#3020)

noir-lang · Oct 6, 2023 · 9893dc7 · 9893dc7
1 parent e4389db
commit 9893dc7
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 46 deletions.
diff --git a/compiler/wasm/package.json b/compiler/wasm/package.json
@@ -20,8 +20,8 @@
   },
   "scripts": {
     "build": "bash ./build.sh",
-    "test": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
-    "test:node": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\" }' mocha",
+    "test": "yarn test:node && yarn test:browser",
+    "test:node": "env TS_NODE_COMPILER_OPTIONS='{\"module\": \"commonjs\"}' mocha",
     "test:browser": "web-test-runner",
     "clean": "chmod u+w web nodejs || true && rm -rf ./nodejs ./web ./target ./result",
     "publish": "echo 📡 publishing `$npm_package_name` && yarn npm publish",

diff --git a/compiler/wasm/test/browser/index.test.ts b/compiler/wasm/test/browser/index.test.ts
@@ -1,6 +1,7 @@
 import { expect } from '@esm-bundle/chai';
-import initNoirWasm from '@noir-lang/noir_wasm';
-import { compileNoirSource, nargoArtifactPath, noirSourcePath } from '../shared';
+import initNoirWasm, { compile } from '@noir-lang/noir_wasm';
+import { initializeResolver } from '@noir-lang/source-resolver';
+import { nargoArtifactPath, noirSourcePath } from '../shared';
 
 beforeEach(async () => {
   await initNoirWasm();
@@ -22,6 +23,35 @@ async function getPrecompiledSource(): Promise<any> {
   return JSON.parse(compiledData);
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function compileNoirSource(noir_source: string): Promise<any> {
+  console.log('Compiling Noir source...');
+
+  initializeResolver((id: string) => {
+    console.log(`Resolving source ${id}`);
+
+    const source = noir_source;
+
+    if (typeof source === 'undefined') {
+      throw Error(`Could not resolve source for '${id}'`);
+    } else if (id !== '/main.nr') {
+      throw Error(`Unexpected id: '${id}'`);
+    } else {
+      return source;
+    }
+  });
+
+  try {
+    const compiled_noir = compile('main.nr');
+
+    console.log('Noir source compilation done.');
+
+    return compiled_noir;
+  } catch (e) {
+    console.log('Error while compiling:', e);
+  }
+}
+
 describe('noir wasm compilation', () => {
   it('matches nargos compilation', async () => {
     const source = await getSource();

diff --git a/compiler/wasm/test/index.d.ts b/compiler/wasm/test/index.d.ts
diff --git a/compiler/wasm/test/node/index.test.ts b/compiler/wasm/test/node/index.test.ts
@@ -1,16 +1,13 @@
 import { expect } from 'chai';
-import { compileNoirSource, nargoArtifactPath, noirSourcePath } from '../shared';
+import { nargoArtifactPath, noirSourcePath } from '../shared';
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
+import { compile } from '@noir-lang/noir_wasm';
 
 async function getFileContent(path: string): Promise<string> {
   return readFileSync(join(__dirname, path)).toString();
 }
 
-async function getSource(): Promise<string> {
-  return getFileContent(noirSourcePath);
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 async function getPrecompiledSource(): Promise<any> {
   const compiledData = await getFileContent(nargoArtifactPath);
@@ -19,10 +16,7 @@ async function getPrecompiledSource(): Promise<any> {
 
 describe('noir wasm compilation', () => {
   it('matches nargos compilation', async () => {
-    const source = await getSource();
-
-    const wasmCircuit = await compileNoirSource(source);
-
+    const wasmCircuit = await compile(noirSourcePath);
     const cliCircuit = await getPrecompiledSource();
 
     // We don't expect the hashes to match due to how `noir_wasm` handles dependencies

diff --git a/compiler/wasm/test/shared.ts b/compiler/wasm/test/shared.ts
@@ -1,34 +1,2 @@
-import { initializeResolver } from '@noir-lang/source-resolver';
-import { compile } from '@noir-lang/noir_wasm';
-
 export const noirSourcePath = '../../noir-script/src/main.nr';
 export const nargoArtifactPath = '../../noir-script/target/noir_wasm_testing.json';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export async function compileNoirSource(noir_source: string): Promise<any> {
-  console.log('Compiling Noir source...');
-
-  initializeResolver((id: string) => {
-    console.log(`Resolving source ${id}`);
-
-    const source = noir_source;
-
-    if (typeof source === 'undefined') {
-      throw Error(`Could not resolve source for '${id}'`);
-    } else if (id !== '/main.nr') {
-      throw Error(`Unexpected id: '${id}'`);
-    } else {
-      return source;
-    }
-  });
-
-  try {
-    const compiled_noir = compile('main.nr');
-
-    console.log('Noir source compilation done.');
-
-    return compiled_noir;
-  } catch (e) {
-    console.log('Error while compiling:', e);
-  }
-}