Skip to content

fix: nargo fmt for backported nested_utility tests #23117

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
Thunkar merged 2 commits into from
May 9, 2026
+8 −29
Merged

fix: nargo fmt for backported nested_utility tests #23117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aeed6b6
fix: nargo fmt for backported nested_utility tests
AztecBot May 8, 2026
5a1a2a1
update PR #23117
AztecBot May 8, 2026
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
25 changes: 5 additions & 20 deletions noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,7 @@ impl<let N: u32, let T: u32> CallPrivateOptions<N, T> {
self,
additional_scopes: [AztecAddress; N_2],
) -> CallPrivateOptions<N_2, T> {
CallPrivateOptions {
additional_scopes,
authorized_utility_call_targets: self.authorized_utility_call_targets,
}
CallPrivateOptions { additional_scopes, authorized_utility_call_targets: self.authorized_utility_call_targets }
}

/// Authorizes cross-contract utility calls to the given target contracts during this call.
Expand All @@ -173,10 +170,7 @@ impl<let N: u32, let T: u32> CallPrivateOptions<N, T> {
self,
targets: [AztecAddress; T_2],
) -> CallPrivateOptions<N, T_2> {
CallPrivateOptions {
additional_scopes: self.additional_scopes,
authorized_utility_call_targets: targets,
}
CallPrivateOptions { additional_scopes: self.additional_scopes, authorized_utility_call_targets: targets }
}
}

Expand Down Expand Up @@ -214,10 +208,7 @@ impl<let S: u32, let T: u32> ViewPrivateOptions<S, T> {
self,
additional_scopes: [AztecAddress; S2],
) -> ViewPrivateOptions<S2, T> {
ViewPrivateOptions {
additional_scopes,
authorized_utility_call_targets: self.authorized_utility_call_targets,
}
ViewPrivateOptions { additional_scopes, authorized_utility_call_targets: self.authorized_utility_call_targets }
}

/// Authorizes cross-contract utility calls to the given target contracts during this call.
Expand All @@ -228,10 +219,7 @@ impl<let S: u32, let T: u32> ViewPrivateOptions<S, T> {
self,
targets: [AztecAddress; T_2],
) -> ViewPrivateOptions<S, T_2> {
ViewPrivateOptions {
additional_scopes: self.additional_scopes,
authorized_utility_call_targets: targets,
}
ViewPrivateOptions { additional_scopes: self.additional_scopes, authorized_utility_call_targets: targets }
}
}

Expand Down Expand Up @@ -773,10 +761,7 @@ impl TestEnvironment {
/// let contract_addr = env.deploy("SampleContract").without_initializer();
/// let return_value = env.execute_utility(SampleContract::at(contract_addr).sample_utility_function());
/// ```
pub unconstrained fn execute_utility<let M: u32, let N: u32, T>(
self: Self,
call: UtilityCall<M, N, T>,
) -> T
pub unconstrained fn execute_utility<let M: u32, let N: u32, T>(self: Self, call: UtilityCall<M, N, T>) -> T
where
T: Deserialize,
{
Expand Down
12 changes: 3 additions & 9 deletions noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/test.nr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,28 +24,22 @@ unconstrained fn same_contract_utility_call_from_utility_succeeds() {
unconstrained fn same_contract_utility_call_from_private_succeeds() {
let (env, account, addr_a, _) = setup();

let result: Field =
env.call_private(account, NestedUtility::at(addr_a).pow_private(2, 10));
let result: Field = env.call_private(account, NestedUtility::at(addr_a).pow_private(2, 10));
assert_eq(result, 1024);
}

#[test(should_fail_with = "Cross-contract utility call denied")]
unconstrained fn cross_contract_utility_call_from_utility_denied_by_default() {
let (env, _, addr_a, addr_b) = setup();

let _: Field = env.execute_utility(
NestedUtility::at(addr_a).delegate_pow_utility(addr_b, 2, 3),
);
let _: Field = env.execute_utility(NestedUtility::at(addr_a).delegate_pow_utility(addr_b, 2, 3));
}

#[test(should_fail_with = "Cross-contract utility call denied")]
unconstrained fn cross_contract_utility_call_from_private_denied_by_default() {
let (env, account, addr_a, addr_b) = setup();

let _: Field = env.call_private(
account,
NestedUtility::at(addr_a).delegate_pow_private(addr_b, 2, 3),
);
let _: Field = env.call_private(account, NestedUtility::at(addr_a).delegate_pow_private(addr_b, 2, 3));
}

#[test]
Expand Down
Loading