Skip to content

chore: noirjs integration testing #2744

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomAFrench merged 12 commits into from
Sep 18, 2023
Merged

chore: noirjs integration testing #2744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
174de09
noirjs integration testing
Sep 18, 2023
9afaf1e
fetch acvm_js version from yarn.lock
Sep 18, 2023
3bb61db
fix awk
Sep 18, 2023
b7d61bd
Fix comand
Sep 18, 2023
3ebc761
Fix version fetch
Sep 18, 2023
956d0e3
Fix prettier
Sep 18, 2023
053dd60
Fix test
Sep 18, 2023
4255cd3
Handle default export
Sep 18, 2023
cb70aa4
Remove integration test trigger
Sep 18, 2023
1abb813
Fetch acvm version from noirjs
Sep 18, 2023
9bbdd42
Fix workflow
Sep 18, 2023
a7c839a
Fix workflow
Sep 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/test-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@ jobs:
- name: Setup `integration-tests`
run: |
yarn workspace @noir-lang/source-resolver build
yarn workspace @noir-lang/noir_js build

- name: Run `integration-tests`
run: |
yarn test:integration
- name: Alert on nightly test failure

- name: Alert on nightly test failure
uses: JasonEtco/create-an-issue@v2
if: ${{ failure() && github.event_name == 'schedule' }}
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/track-acvm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Track ACVM for Integration Tests
on:
pull_request:
paths:
- 'Cargo.lock'
- 'yarn.lock'
- "Cargo.lock"
- "yarn.lock"

jobs:
check_matching_version:
Expand All @@ -17,10 +17,10 @@ jobs:
run: |
# Extract acvm version from the current Cargo.lock
CURRENT_VERSION=$(awk '/name = "acvm"/ {getline; print $3}' Cargo.lock | tr -d '"')
INTEGRATION_TEST_VERSION=$(yarn workspace integration-tests info @noir-lang/acvm_js --json | jq .children.Version | tr -d '"')
INTEGRATION_TEST_VERSION=$(yarn workspace @noir-lang/noir_js info @noir-lang/acvm_js --json | jq .children.Version | tr -d '"')

echo "Current ACVM Version: $CURRENT_VERSION"
echo "Integration Test ACVM Version: $INTEGRATION_TEST_VERSION"
echo "Integration Test ACVM Version (Noir JS): $INTEGRATION_TEST_VERSION"

if [ "$CURRENT_VERSION" != "$INTEGRATION_TEST_VERSION" ]; then
exit 1
Expand Down
5 changes: 2 additions & 3 deletions compiler/integration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,14 @@
"build": "echo Integration Test build step",
"test": "yarn test:browser",
"test:browser": "web-test-runner",
"test:integration:browser": "web-test-runner test//integration/browser/**/*.test.ts",
"test:integration:browser": "web-test-runner test/integration/browser/**/*.test.ts",
"test:integration:browser:watch": "web-test-runner test/integration/browser/**/*.test.ts --watch",
"lint": "NODE_NO_WARNINGS=1 eslint . --ext .ts --ignore-path ./.eslintignore --max-warnings 0"
},
"dependencies": {
"@aztec/bb.js": "^0.6.7",
"@noir-lang/acvm_js": "^0.26.1",
"@noir-lang/noir_js": "workspace:*",
"@noir-lang/noir_wasm": "workspace:*",
"@noir-lang/noirc_abi": "workspace:*",
"@noir-lang/source-resolver": "workspace:*",
"@web/dev-server-esbuild": "^0.3.6",
"@web/test-runner": "^0.15.3",
Expand Down
15 changes: 7 additions & 8 deletions compiler/integration-tests/test/integration/browser/compile_prove_verify.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ import newCompiler, {
compile,
init_log_level as compilerLogLevel,
} from "@noir-lang/noir_wasm";
import { decompressSync as gunzip } from "fflate";
import newABICoder, { abiEncode } from "@noir-lang/noirc_abi";
import initACVM, {
executeCircuit,
WitnessMap,
compressWitness,
} from "@noir-lang/acvm_js";

import { Barretenberg, RawBuffer, Crs } from "@aztec/bb.js";
import { acvm, noirc } from "@noir-lang/noir_js";
import { decompressSync as gunzip } from "fflate";

import * as TOML from "smol-toml";

const { default: initACVM, executeCircuit, compressWitness } = acvm;
const { default: newABICoder, abiEncode } = noirc;

type WitnessMap = acvm.WitnessMap;

await newCompiler();
await newABICoder();
await initACVM();
Expand Down
7 changes: 3 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,14 +385,14 @@ __metadata:
languageName: node
linkType: hard

"@noir-lang/acvm_js@npm:0.26.1, @noir-lang/acvm_js@npm:^0.26.1":
"@noir-lang/acvm_js@npm:0.26.1":
version: 0.26.1
resolution: "@noir-lang/acvm_js@npm:0.26.1"
checksum: ae8cb6e31610cd8aa392855342d0c953a1bc4cd9e07236340341afa5815696a69a6635c38241f1d6a5dd30c5a8ae49234f2ba8b71d46c5d1a46756ff6f4dde3a
languageName: node
linkType: hard

"@noir-lang/noir_js@workspace:tooling/noir_js":
"@noir-lang/noir_js@workspace:*, @noir-lang/noir_js@workspace:tooling/noir_js":
version: 0.0.0-use.local
resolution: "@noir-lang/noir_js@workspace:tooling/noir_js"
dependencies:
Expand Down Expand Up @@ -4282,9 +4282,8 @@ __metadata:
resolution: "integration-tests@workspace:compiler/integration-tests"
dependencies:
"@aztec/bb.js": ^0.6.7
"@noir-lang/acvm_js": ^0.26.1
"@noir-lang/noir_js": "workspace:*"
"@noir-lang/noir_wasm": "workspace:*"
"@noir-lang/noirc_abi": "workspace:*"
"@noir-lang/source-resolver": "workspace:*"
"@web/dev-server-esbuild": ^0.3.6
"@web/test-runner": ^0.15.3
Expand Down