Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion noir/noir-repo
Submodule noir-repo updated 53 files
+1 −0 Cargo.lock
+349 −3 compiler/noirc_evaluator/src/ssa/ir/dfg/simplify/call.rs
+12 −4 compiler/noirc_evaluator/src/ssa/ir/instruction.rs
+46 −0 compiler/noirc_evaluator/src/ssa/mod.rs
+85 −3 compiler/noirc_evaluator/src/ssa/validation/mod.rs
+1 −1 compiler/noirc_frontend/src/elaborator/expressions.rs
+1 −1 compiler/noirc_frontend/src/hir_def/expr.rs
+1 −1 compiler/noirc_frontend/src/monomorphization/mod.rs
+31 −13 noir_stdlib/src/array/mod.nr
+17 −57 noir_stdlib/src/hash/poseidon2.nr
+6 −0 test_programs/execution_success/regression_12467_2/Nargo.toml
+2 −0 test_programs/execution_success/regression_12467_2/Prover.toml
+6 −0 test_programs/execution_success/regression_12467_2/src/main.nr
+6 −0 test_programs/execution_success/regression_12473/Nargo.toml
+1 −0 test_programs/execution_success/regression_12473/Prover.toml
+9 −0 test_programs/execution_success/regression_12473/src/main.nr
+6 −0 test_programs/execution_success/regression_12475/Nargo.toml
+7 −0 test_programs/execution_success/regression_12475/src/main.nr
+7 −4 tooling/acvm_cli/src/cli/execute_cmd.rs
+1 −0 tooling/artifact_cli/src/bin/execute.rs
+3 −3 tooling/artifact_cli/src/commands/execute_cmd.rs
+1 −0 tooling/nargo/Cargo.toml
+2 −0 tooling/nargo/src/foreign_calls/mod.rs
+98 −0 tooling/nargo/src/foreign_calls/oracle_resolver_url.rs
+3 −2 tooling/nargo_cli/src/cli/debug_cmd.rs
+2 −1 tooling/nargo_cli/src/cli/execute_cmd.rs
+3 −3 tooling/nargo_cli/src/cli/fuzz_cmd.rs
+3 −3 tooling/nargo_cli/src/cli/test_cmd.rs
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/assert_msg_runtime/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/assert_msg_runtime/execute__tests__brillig_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/brillig_assert_fail/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/brillig_assert_fail/execute__tests__brillig_stderr.snap
+3 −3 ...ing/nargo_cli/tests/snapshots/execution_failure/brillig_assert_msg_runtime/execute__tests__acir_stderr.snap
+3 −3 .../nargo_cli/tests/snapshots/execution_failure/brillig_assert_msg_runtime/execute__tests__brillig_stderr.snap
+3 −3 ...argo_cli/tests/snapshots/execution_failure/fold_nested_brillig_assert_fail/execute__tests__acir_stderr.snap
+3 −3 ...o_cli/tests/snapshots/execution_failure/fold_nested_brillig_assert_fail/execute__tests__brillig_stderr.snap
+6 −6 tooling/nargo_cli/tests/snapshots/execution_failure/option_expect/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/option_expect/execute__tests__brillig_stderr.snap
+16 −16 tooling/nargo_cli/tests/snapshots/execution_failure/regression_10929/execute__tests__acir_stderr.snap
+8 −8 tooling/nargo_cli/tests/snapshots/execution_failure/regression_10929/execute__tests__brillig_stderr.snap
+6 −6 tooling/nargo_cli/tests/snapshots/execution_failure/regression_5202/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/regression_5202/execute__tests__brillig_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/regression_7128/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/regression_7128/execute__tests__brillig_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/workspace_fail/execute__tests__acir_stderr.snap
+3 −3 tooling/nargo_cli/tests/snapshots/execution_failure/workspace_fail/execute__tests__brillig_stderr.snap
+10 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12467_2/execute__tests__expanded.snap
+5 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12467_2/execute__tests__stdout.snap
+13 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12473/execute__tests__expanded.snap
+5 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12473/execute__tests__stdout.snap
+11 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12475/execute__tests__expanded.snap
+5 −0 tooling/nargo_cli/tests/snapshots/execution_success/regression_12475/execute__tests__stdout.snap
+3 −1 tooling/noir_js/test/node/execute.test.ts
8 changes: 5 additions & 3 deletions yarn-project/end-to-end/src/e2e_avm_simulator.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ describe('e2e_avm_simulator', () => {
describe('Assertions & error enriching', () => {
/**
* Expect an error like:
* Assertion failed: This assertion should fail! 'not_true == true'
* Assertion failed: This assertion should fail! 'assert(not_true == true, "This assertion should fail!")'
* ...
* at not_true == true (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:223:16)
* at assert(not_true == true, "This assertion should fail!") (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:223:5)
* at inner_helper_with_failed_assertion() (../../../../../../../home/aztec-dev/aztec-packages/noir-projects/noir-contracts/contracts/test/avm_test_contract/src/main.nr:228:9)
* at quote { $self } (../std/meta/expr.nr:269:9)
* at function.name();
Expand All @@ -60,7 +60,9 @@ describe('e2e_avm_simulator', () => {
avmContract.methods.assertion_failure().simulate({ from: defaultAccountAddress }),
).rejects.toThrow(
expect.objectContaining({
message: expect.stringMatching(/Assertion failed: This assertion should fail! 'not_true == true'/),
message: expect.stringMatching(
/Assertion failed: This assertion should fail! 'assert\(not_true == true, "This assertion should fail!"\)'/,
),
stack: expect.stringMatching(/at inner_helper_with_failed_assertion[\s\S]*at AvmTest\..*/),
}),
);
Expand Down
Loading