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
4 changes: 3 additions & 1 deletion yarn-project/end-to-end/bootstrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ function avm_check_circuit {
# tests are known-flaky and provide no additional backwards-compat coverage). Also excludes
# kernelless_simulation, which asserts on the exact number of nullifiers emitted and breaks whenever
# contracts add/remove nullifier emissions across versions (unrelated to the compat contract surface).
# event_logs is excluded because the new tagging-cache reconciliation test (#23044) calls a
# TestLog method (deliver_squashed_and_surviving_notes) that does not exist in legacy artifacts.
function compat_test_cmds {
local version=${1:?version is required}
local run_test_script="yarn-project/end-to-end/scripts/run_test.sh"
Expand All @@ -271,7 +273,7 @@ function compat_test_cmds {
local tests=(
src/e2e_!(prover|block_building|epochs)/*.test.ts
src/e2e_p2p/reqresp/*.test.ts
src/e2e_!(block_building|prover_*|kernelless_simulation).test.ts
src/e2e_!(block_building|prover_*|kernelless_simulation|event_logs).test.ts
)
for test in "${tests[@]}"; do
local name=${test#*e2e_}
Expand Down
9 changes: 6 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 @@ -56,16 +56,19 @@ describe('e2e_avm_simulator', () => {
* at function.name();
* let call = quote { $name($args) (/home/aztec-dev/aztec-packages/noir-projects/aztec-nr/aztec/src/macros/dispatch.nr:59:20)
* at AvmTest.0xc3515746
*
* Older nargo (pre-#22911) recorded the assertion span as the inner boolean expression only,
* so legacy contract artifacts under compat-e2e emit `'not_true == true'` instead of the full
* `'assert(not_true == true, "This assertion should fail!")'`. The regex below accepts either
* form so the test passes against both current-nargo artifacts and pinned legacy artifacts.
*/
describe('Not nested', () => {
it('PXE processes user code assertions and recovers message (properly enriched)', async () => {
await expect(
avmContract.methods.assertion_failure().simulate({ from: defaultAccountAddress }),
).rejects.toThrow(
expect.objectContaining({
message: expect.stringMatching(
/Assertion failed: This assertion should fail! 'assert\(not_true == true, "This assertion should fail!"\)'/,
),
message: expect.stringMatching(/Assertion failed: This assertion should fail!.*not_true == true/),
stack: expect.stringMatching(/at inner_helper_with_failed_assertion[\s\S]*at AvmTest\..*/),
}),
);
Expand Down
Loading