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
114 changes: 78 additions & 36 deletions avm-transpiler/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion avm-transpiler/src/transpile.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@ pub fn patch_debug_info_pcs(
for (original_opcode_location, source_locations) in opcode_locations_map.iter() {
let avm_opcode_location =
BrilligOpcodeLocation(brillig_pcs_to_avm_pcs[original_opcode_location.0]);
patched_locations.insert(avm_opcode_location, source_locations.clone());
patched_locations.insert(avm_opcode_location, *source_locations);
}
// insert the new map as a brillig locations map for the current function id
patched_brillig_locations.insert(*brillig_function_id, patched_locations);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ unconstrained fn burn_public_on_behalf_of_other() {
utils::check_public_balance(token_contract_address, owner, mint_amount - burn_amount);
}

#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow 'self - other'")]
#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow")]
unconstrained fn burn_public_failure_more_than_balance() {
let (env, token_contract_address, owner, _, mint_amount) =
utils::setup_and_mint_to_public(/* with_account_contracts */ false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unconstrained fn public_transfer_on_behalf_of_other() {
utils::check_public_balance(token_contract_address, recipient, transfer_amount);
}

#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow 'self - other'")]
#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow")]
unconstrained fn public_transfer_failure_more_than_balance() {
// Setup without account contracts. We are not using authwits here, so dummy accounts are enough
let (env, token_contract_address, owner, recipient, mint_amount) =
Expand Down Expand Up @@ -106,7 +106,7 @@ unconstrained fn public_transfer_failure_on_behalf_of_other_without_approval() {
public_transfer_in_private_call_interface.call(&mut env.public());
}

#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow 'self - other'")]
#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow")]
unconstrained fn public_transfer_failure_on_behalf_of_other_more_than_balance() {
// Setup with account contracts. Slower since we actually deploy them, but needed for authwits.
let (env, token_contract_address, owner, recipient, mint_amount) =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ unconstrained fn transfer_to_private_transfer_not_prepared() {
);
}

#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow 'self - other'")]
#[test(should_fail_with = "Assertion failed: attempt to subtract with overflow")]
unconstrained fn transfer_to_private_failure_not_an_owner() {
// Setup without account contracts. We are not using authwits here, so dummy accounts are enough
let (env, token_contract_address, owner, not_owner, amount) =
Expand Down
2 changes: 1 addition & 1 deletion noir/noir-repo-ref
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2025-04-22
nightly-2025-04-28
2 changes: 1 addition & 1 deletion yarn-project/end-to-end/src/e2e_account_contracts.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const itShouldBehaveLikeAnAccountContract = (
const entrypoint = randomContract.getInterface(accountAddress, nodeInfo);
const invalidWallet = new AccountWallet(pxe, entrypoint);
const childWithInvalidWallet = await ChildContract.at(child.address, invalidWallet);
await expect(childWithInvalidWallet.methods.value(42).prove()).rejects.toThrow(/Cannot satisfy constraint.*/);
await expect(childWithInvalidWallet.methods.value(42).prove()).rejects.toThrow('Cannot satisfy constraint');
});
});
};
Expand Down
Loading