test: regenerate contract-snapshots for v4-next

Re-runs the cargo-insta snapshot tests against the v4-next compiler and
the v4-next aztec-nr / contract code, accepting the diffs:

- compile_failure/authorization_selector_collision: one extra
  'check_parent_traits_are_implemented: missing trait ID' diagnostic on
  v4-next's authorization.nr.
- expand/avm_gadgets_test_contract: keccak_hash_300 doesn't exist on
  v4-next's avm_gadgets_test_contract.
- expand/avm_test_contract: ordering / minor signature differences on
  v4-next's avm_test_contract.

Author: AztecBot

noir-projects/contract-snapshots/tests/snapshots/compile_failure/authorization_selector_collision/snapshots__stderr.snap

@@ -38,6 +38,18 @@ error: check_trait_impl_where_clause_matches_trait_where_clause: missing trait I
    │     ---------------- While running this function attribute
    │
 
+error: check_parent_traits_are_implemented: missing trait ID
+   ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:23:16
+   │
+23 │     let name = s.name();
+   │                --------
+   │
+   ┌─ src/main.nr:24:5
+   │
+24 │     #[authorization]
+   │     ---------------- While running this function attribute
+   │
+
 error: check_trait_impl_method_matches_declaration: missing trait impl
    ┌─ <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:42:16
    │
@@ -64,4 +76,4 @@ error: Selector collision detected between authorizations 'EventCollision8370082
     3: register_authorization
             at <repo>/noir-projects/aztec-nr/aztec/src/macros/authorization.nr:15:9
 
-Aborting due to 5 previous errors
+Aborting due to 6 previous errors

noir-projects/contract-snapshots/tests/snapshots/expand/avm_gadgets_test_contract/snapshots__expanded.snap

@@ -2,6 +2,7 @@
 source: tests/snapshots.rs
 expression: stdout
 ---
+
 use aztec::macros::aztec;
 use aztec::macros::aztec;
 
@@ -12,10 +13,6 @@ contract AvmGadgetsTest {
     #[contract_library_method]
     fn keccak_hash(data: [u8; 10]) -> [u8; 32];
 
-    #[deprecated(deny, "Direct invocation of public functions is not supported. You attempted to call keccak_hash_300. See https://docs.aztec.network/errors/6")]
-    #[contract_library_method]
-    fn keccak_hash_300(data: [u8; 300]) -> [u8; 32];
-
     #[deprecated(deny, "Direct invocation of public functions is not supported. You attempted to call keccak_hash_1400. See https://docs.aztec.network/errors/6")]
     #[contract_library_method]
     fn keccak_hash_1400(data: [u8; 1400]) -> [u8; 32];
@@ -159,12 +156,6 @@ contract AvmGadgetsTest {
             Self { target_contract: aztec::protocol::address::AztecAddress::zero()}
         }
 
-        pub fn sha256_hash_1536(self, data: [u8; 1536]) -> aztec::context::calls::PublicCall<16, 1536, [u8; 32]> {
-            let serialized_params: [Field; 1536] = <[u8; 1536] as aztec::protocol::traits::Serialize>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
-            aztec::context::calls::PublicCall::<16, 1536, [u8; 32]>::new(self.target_contract, selector, "sha256_hash_1536", serialized_params)
-        }
-
         pub fn pedersen_hash_with_index(self, data: [Field; 10]) -> aztec::context::calls::PublicCall<24, 10, Field> {
             let serialized_params: [Field; 10] = <[Field; 10] as aztec::protocol::traits::Serialize>::serialize(data);
             let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3265405934_Field);
@@ -297,10 +288,10 @@ contract AvmGadgetsTest {
             aztec::context::calls::PublicCall::<16, 1400, [u8; 32]>::new(self.target_contract, selector, "keccak_hash_1400", serialized_params)
         }
 
-        pub fn keccak_hash_300(self, data: [u8; 300]) -> aztec::context::calls::PublicCall<15, 300, [u8; 32]> {
-            let serialized_params: [Field; 300] = <[u8; 300] as aztec::protocol::traits::Serialize>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3065624740_Field);
-            aztec::context::calls::PublicCall::<15, 300, [u8; 32]>::new(self.target_contract, selector, "keccak_hash_300", serialized_params)
+        pub fn sha256_hash_1536(self, data: [u8; 1536]) -> aztec::context::calls::PublicCall<16, 1536, [u8; 32]> {
+            let serialized_params: [Field; 1536] = <[u8; 1536] as aztec::protocol::traits::Serialize>::serialize(data);
+            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
+            aztec::context::calls::PublicCall::<16, 1536, [u8; 32]>::new(self.target_contract, selector, "sha256_hash_1536", serialized_params)
         }
 
         pub fn offchain_receive(self, messages: BoundedVec<aztec::messages::processing::offchain::OffchainMessage, 16>) -> aztec::context::calls::UtilityCall<16, 321, ()> {
@@ -349,15 +340,6 @@ contract AvmGadgetsTest {
     }
 
     impl CallSelf<aztec::context::PublicContext> {
-        pub fn sha256_hash_1536(self, data: [u8; 1536]) -> [u8; 32] {
-            let serialized_params: [Field; 1536 * 1] = <[u8; 1536] as aztec::protocol::traits::Serialize<N = 1536 * 1>>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
-            // Safety: comment added by `nargo expand`
-            unsafe {
-                aztec::context::calls::PublicCall::<16, 1536 * 1, [u8; 32]>::new(self.address, selector, "sha256_hash_1536", serialized_params).call(self.context)
-            }
-        }
-
         pub fn pedersen_hash_with_index(self, data: [Field; 10]) -> Field {
             let serialized_params: [Field; 10 * 1] = <[Field; 10] as aztec::protocol::traits::Serialize<N = 10 * 1>>::serialize(data);
             let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3265405934_Field);
@@ -556,12 +538,12 @@ contract AvmGadgetsTest {
             }
         }
 
-        pub fn keccak_hash_300(self, data: [u8; 300]) -> [u8; 32] {
-            let serialized_params: [Field; 300 * 1] = <[u8; 300] as aztec::protocol::traits::Serialize<N = 300 * 1>>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3065624740_Field);
+        pub fn sha256_hash_1536(self, data: [u8; 1536]) -> [u8; 32] {
+            let serialized_params: [Field; 1536 * 1] = <[u8; 1536] as aztec::protocol::traits::Serialize<N = 1536 * 1>>::serialize(data);
+            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
             // Safety: comment added by `nargo expand`
             unsafe {
-                aztec::context::calls::PublicCall::<15, 300 * 1, [u8; 32]>::new(self.address, selector, "keccak_hash_300", serialized_params).call(self.context)
+                aztec::context::calls::PublicCall::<16, 1536 * 1, [u8; 32]>::new(self.address, selector, "sha256_hash_1536", serialized_params).call(self.context)
             }
         }
     }
@@ -577,15 +559,6 @@ contract AvmGadgetsTest {
     }
 
     impl EnqueueSelf<&mut aztec::context::PrivateContext> {
-        pub fn sha256_hash_1536(self, data: [u8; 1536]) {
-            let serialized_params: [Field; 1536 * 1] = <[u8; 1536] as aztec::protocol::traits::Serialize<N = 1536 * 1>>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
-            let calldata: [Field; 1 + (1536 * 1)] = [<aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::ToField>::to_field(selector)].concat(serialized_params);
-            let calldata_hash: Field = aztec::hash::hash_calldata_array(calldata);
-            aztec::oracle::execution_cache::store(calldata, calldata_hash);
-            self.context.call_public_function_with_calldata_hash(self.address, calldata_hash, false, false);
-        }
-
         pub fn pedersen_hash_with_index(self, data: [Field; 10]) {
             let serialized_params: [Field; 10 * 1] = <[Field; 10] as aztec::protocol::traits::Serialize<N = 10 * 1>>::serialize(data);
             let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3265405934_Field);
@@ -784,10 +757,10 @@ contract AvmGadgetsTest {
             self.context.call_public_function_with_calldata_hash(self.address, calldata_hash, false, false);
         }
 
-        pub fn keccak_hash_300(self, data: [u8; 300]) {
-            let serialized_params: [Field; 300 * 1] = <[u8; 300] as aztec::protocol::traits::Serialize<N = 300 * 1>>::serialize(data);
-            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(3065624740_Field);
-            let calldata: [Field; 1 + (300 * 1)] = [<aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::ToField>::to_field(selector)].concat(serialized_params);
+        pub fn sha256_hash_1536(self, data: [u8; 1536]) {
+            let serialized_params: [Field; 1536 * 1] = <[u8; 1536] as aztec::protocol::traits::Serialize<N = 1536 * 1>>::serialize(data);
+            let selector: aztec::protocol::abis::function_selector::FunctionSelector = <aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::FromField>::from_field(373006257_Field);
+            let calldata: [Field; 1 + (1536 * 1)] = [<aztec::protocol::abis::function_selector::FunctionSelector as aztec::protocol::traits::ToField>::to_field(selector)].concat(serialized_params);
             let calldata_hash: Field = aztec::hash::hash_calldata_array(calldata);
             aztec::oracle::execution_cache::store(calldata, calldata_hash);
             self.context.call_public_function_with_calldata_hash(self.address, calldata_hash, false, false);
@@ -815,13 +788,6 @@ contract AvmGadgetsTest {
             let return_value: [Field; 32 * 1] = <[u8; 32] as aztec::protocol::traits::Serialize<N = 32 * 1>>::serialize(__aztec_nr_internals__keccak_hash(arg0));
             aztec::oracle::avm::avm_return(return_value.as_vector());
         };
-        if selector == 3065624740_Field {
-            let input_calldata: [Field; 300 * 1] = aztec::oracle::avm::calldata_copy(1_u32, <[u8; 300] as aztec::protocol::traits::Serialize<N = 300 * 1>>::N);
-            let mut reader: aztec::protocol::utils::reader::Reader<300 * 1> = aztec::protocol::utils::reader::Reader::<300 * 1>::new(input_calldata);
-            let arg0: [u8; 300] = <[u8; 300] as aztec::protocol::traits::Deserialize<N = 300 * 1>>::stream_deserialize(&mut reader);
-            let return_value: [Field; 32 * 1] = <[u8; 32] as aztec::protocol::traits::Serialize<N = 32 * 1>>::serialize(__aztec_nr_internals__keccak_hash_300(arg0));
-            aztec::oracle::avm::avm_return(return_value.as_vector());
-        };
         if selector == 372001522_Field {
             let input_calldata: [Field; 1400 * 1] = aztec::oracle::avm::calldata_copy(1_u32, <[u8; 1400] as aztec::protocol::traits::Serialize<N = 1400 * 1>>::N);
             let mut reader: aztec::protocol::utils::reader::Reader<1400 * 1> = aztec::protocol::utils::reader::Reader::<1400 * 1>::new(input_calldata);
@@ -987,10 +953,6 @@ contract AvmGadgetsTest {
         pub data: [u8; 1400],
     }
 
-    pub struct keccak_hash_300_parameters {
-        pub data: [u8; 300],
-    }
-
     pub struct keccak_hash_parameters {
         pub data: [u8; 10],
     }
@@ -1087,12 +1049,6 @@ contract AvmGadgetsTest {
         return_type: [u8; 32],
     }
 
-    #[abi(functions)]
-    pub struct keccak_hash_300_abi {
-        parameters: keccak_hash_300_parameters,
-        return_type: [u8; 32],
-    }
-
     #[abi(functions)]
     pub struct keccak_hash_abi {
         parameters: keccak_hash_parameters,
@@ -1273,24 +1229,6 @@ contract AvmGadgetsTest {
         }
     }
 
-    unconstrained fn __aztec_nr_internals__keccak_hash_300(data: [u8; 300]) -> pub [u8; 32] {
-        let mut self: aztec::contract_self::contract_self_public::ContractSelfPublic<(), CallSelf<aztec::context::PublicContext>, CallSelfStatic<aztec::context::PublicContext>, CallInternal<aztec::context::PublicContext>> = {
-            let context: aztec::context::PublicContext = aztec::context::PublicContext::new(|| -> Field {
-                let serialized_args: [Field; 300 * 1] = aztec::oracle::avm::calldata_copy(1_u32, <[u8; 300] as aztec::protocol::traits::Serialize<N = 300 * 1>>::N);
-                aztec::hash::hash_args(serialized_args)
-            });
-            let storage: () = ();
-            let self_address: aztec::protocol::address::AztecAddress = context.this_address();
-            let call_self: CallSelf<aztec::context::PublicContext> = CallSelf::<aztec::context::PublicContext> { address: self_address, context: context};
-            let call_self_static: CallSelfStatic<aztec::context::PublicContext> = CallSelfStatic::<aztec::context::PublicContext> { address: self_address, context: context};
-            let internal: CallInternal<aztec::context::PublicContext> = CallInternal::<aztec::context::PublicContext> { context: context};
-            aztec::contract_self::contract_self_public::ContractSelfPublic::<(), CallSelf<aztec::context::PublicContext>, CallSelfStatic<aztec::context::PublicContext>, CallInternal<aztec::context::PublicContext>>::new(context, storage, call_self, call_self_static, internal)
-        };
-        {
-            keccak256::keccak256(data, data.len())
-        }
-    }
-
     unconstrained fn __aztec_nr_internals__pedersen_hash(data: [Field; 10]) -> pub Field {
         let mut self: aztec::contract_self::contract_self_public::ContractSelfPublic<(), CallSelf<aztec::context::PublicContext>, CallSelfStatic<aztec::context::PublicContext>, CallInternal<aztec::context::PublicContext>> = {
             let context: aztec::context::PublicContext = aztec::context::PublicContext::new(|| -> Field {