From aeed6b60d92d4ff3a3137e78b28a928902aba7b0 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Fri, 8 May 2026 21:41:11 +0000 Subject: [PATCH 1/2] fix: nargo fmt for backported nested_utility tests --- .../test/nested_utility_contract/src/test.nr | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/test.nr b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/test.nr index 51fe8fc5c221..a68f26539e2e 100644 --- a/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/test.nr +++ b/noir-projects/noir-contracts/contracts/test/nested_utility_contract/src/test.nr @@ -24,8 +24,7 @@ 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); } @@ -33,19 +32,14 @@ unconstrained fn same_contract_utility_call_from_private_succeeds() { 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] From 5a1a2a175e04ae9dc3cde54c786a791c7a72964c Mon Sep 17 00:00:00 2001 From: AztecBot Date: Fri, 8 May 2026 21:51:57 +0000 Subject: [PATCH 2/2] update PR #23117 --- .../src/test/helpers/test_environment.nr | 25 ++++--------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr index 536001d926ff..e7f35472a3d1 100644 --- a/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr +++ b/noir-projects/aztec-nr/aztec/src/test/helpers/test_environment.nr @@ -159,10 +159,7 @@ impl CallPrivateOptions { self, additional_scopes: [AztecAddress; N_2], ) -> CallPrivateOptions { - 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. @@ -173,10 +170,7 @@ impl CallPrivateOptions { self, targets: [AztecAddress; T_2], ) -> CallPrivateOptions { - CallPrivateOptions { - additional_scopes: self.additional_scopes, - authorized_utility_call_targets: targets, - } + CallPrivateOptions { additional_scopes: self.additional_scopes, authorized_utility_call_targets: targets } } } @@ -214,10 +208,7 @@ impl ViewPrivateOptions { self, additional_scopes: [AztecAddress; S2], ) -> ViewPrivateOptions { - 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. @@ -228,10 +219,7 @@ impl ViewPrivateOptions { self, targets: [AztecAddress; T_2], ) -> ViewPrivateOptions { - ViewPrivateOptions { - additional_scopes: self.additional_scopes, - authorized_utility_call_targets: targets, - } + ViewPrivateOptions { additional_scopes: self.additional_scopes, authorized_utility_call_targets: targets } } } @@ -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( - self: Self, - call: UtilityCall, - ) -> T + pub unconstrained fn execute_utility(self: Self, call: UtilityCall) -> T where T: Deserialize, {