From 09162e7c0974e0e34b886a73449d70425d8f0ad9 Mon Sep 17 00:00:00 2001 From: sirasistant Date: Tue, 12 Dec 2023 13:42:48 +0000 Subject: [PATCH 1/2] feat: run the protocol circuits test in ci --- yarn-project/noir-protocol-circuits/package.json | 7 +++---- .../src/crates/types/src/tests/fixtures/contract_tree.nr | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json index f5eccb835a5..bc9bf7881b7 100644 --- a/yarn-project/noir-protocol-circuits/package.json +++ b/yarn-project/noir-protocol-circuits/package.json @@ -15,11 +15,10 @@ "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*", "noir:types": "yarn ts-node --esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix", "noir:test": "cd src && ../../../noir/target/release/nargo test", - "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" + "test": "yarn test:js && yarn test:nargo", + "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests", + "test:nargo": "cd src && ../../../noir/target/release/nargo test" }, - "inherits": [ - "../package.common.json" - ], "jest": { "preset": "ts-jest/presets/default-esm", "moduleNameMapper": { diff --git a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr index 81626d401d8..867f28adbe1 100644 --- a/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr +++ b/yarn-project/noir-protocol-circuits/src/crates/types/src/tests/fixtures/contract_tree.nr @@ -1,8 +1,8 @@ // Constants taken from __snapshots__/noir_test_gen.test.ts.snap -global ROOT = 0x08ccb752b9e4f898ad6b87fb9ca1ed1f2b5e0b6cd67bf083e466ca6a31e21fae; +global ROOT = 0x2d541f5813387a5f4b32d1b3b103447ae142927457a60d00c779a5eeaead471d; global SIBLING_PATHS = [ [ - 0x141929db05c4a4803aebc2a4aea0fb2f09a15ae9862c4da49f245b7726f4088e, + 0x0c58a1ae52142f3369f9c46e6717bbef5aa55f9fc0e901a7d8cc860d9467021e, 0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed, 0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550, 0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb, @@ -20,7 +20,7 @@ global SIBLING_PATHS = [ 0x177b9a10bbee32f77c719c6f8d071a18476cbeb021e155c642bbf93c716ce943, ], [ - 0x0b5dfb998fbdce8e5804992d471c1fc8050642b7aba107e854052eb562944a01, + 0x1ec6c50dc972349d72602ec6887f7accd3174d912ea58629447937865cb88a4d, 0x27b1d0839a5b23baf12a8d195b18ac288fcf401afb2f70b8a4b529ede5fa9fed, 0x21dbfd1d029bf447152fcf89e355c334610d1632436ba170f738107266a71550, 0x0bcd1f91cf7bdd471d0a30c58c4706f3fdab3807a954b8f5b5e3bfec87d001bb, From 0d403bdcd925b9ab8488ae90600f889fdd986a57 Mon Sep 17 00:00:00 2001 From: sirasistant Date: Tue, 12 Dec 2023 13:44:39 +0000 Subject: [PATCH 2/2] chore: reuse noir:test --- yarn-project/noir-protocol-circuits/package.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/yarn-project/noir-protocol-circuits/package.json b/yarn-project/noir-protocol-circuits/package.json index bc9bf7881b7..26096a5ecaa 100644 --- a/yarn-project/noir-protocol-circuits/package.json +++ b/yarn-project/noir-protocol-circuits/package.json @@ -15,9 +15,8 @@ "noir:build": "cd src && ../../../noir/target/release/nargo compile --silence-warnings && rm -rf ./target/debug_*", "noir:types": "yarn ts-node --esm src/scripts/generate_ts_from_abi.ts && yarn formatting:fix", "noir:test": "cd src && ../../../noir/target/release/nargo test", - "test": "yarn test:js && yarn test:nargo", - "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests", - "test:nargo": "cd src && ../../../noir/target/release/nargo test" + "test": "yarn test:js && yarn noir:test", + "test:js": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests" }, "jest": { "preset": "ts-jest/presets/default-esm",