feat: replace @array by Span

foundry-rs · Aug 26, 2024 · 4cc7209 · 4cc7209
1 parent e8e50d1
commit 4cc7209
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 19 deletions.
diff --git a/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo b/crates/forge/tests/data/trace_resources/tests/test_deploy.cairo
@@ -11,19 +11,19 @@ fn test_deploy() {
 
     let (checker_address, _) = checker.deploy(@array![]).unwrap();
 
-    proxy.deploy(@array![checker_address.into(), empty_hash.into(), 1]).unwrap();
+    proxy.deploy([checker_address.into(), empty_hash.into(), 1].span()).unwrap();
 
     deploy_syscall(
         proxy.class_hash, 0, array![checker_address.into(), empty_hash.into(), 2].span(), false
     )
         .unwrap_syscall();
 
     proxy
-        .deploy_at(@array![checker_address.into(), empty_hash.into(), 3], 123.try_into().unwrap())
+        .deploy_at([checker_address.into(), empty_hash.into(), 3].span(), 123.try_into().unwrap())
         .unwrap();
 
     deploy_syscall(
-        proxy.class_hash, 12412, array![checker_address.into(), empty_hash.into(), 4].span(), false
+        proxy.class_hash, 12412, [checker_address.into(), empty_hash.into(), 4].span(), false
     )
         .unwrap_syscall();
 }
diff --git a/snforge_std/src/cheatcodes/contract_class.cairo b/snforge_std/src/cheatcodes/contract_class.cairo
@@ -24,7 +24,7 @@ pub trait ContractClassTrait {
     /// `constructor_calldata` - serialized calldata for the deploy constructor
     /// Returns the precalculated `ContractAddress`
     fn precalculate_address(
-        self: @ContractClass, constructor_calldata: @Array::<felt252>
+        self: @ContractClass, constructor_calldata: Span<felt252>
     ) -> ContractAddress;
 
     /// Deploys a contract
@@ -33,7 +33,7 @@ pub trait ContractClassTrait {
     /// Returns the address the contract was deployed at and serialized constructor return data, or
     /// panic data if it failed
     fn deploy(
-        self: @ContractClass, constructor_calldata: @Array::<felt252>
+        self: @ContractClass, constructor_calldata: Span<felt252>
     ) -> SyscallResult<(ContractAddress, Span<felt252>)>;
 
     /// Deploys a contract at a given address
@@ -43,9 +43,7 @@ pub trait ContractClassTrait {
     /// Returns the address the contract was deployed at and serialized constructor return data, or
     /// panic data if it failed
     fn deploy_at(
-        self: @ContractClass,
-        constructor_calldata: @Array::<felt252>,
-        contract_address: ContractAddress
+        self: @ContractClass, constructor_calldata: Span<felt252>, contract_address: ContractAddress
     ) -> SyscallResult<(ContractAddress, Span<felt252>)>;
 
     /// Utility method for creating a new `ContractClass` instance
@@ -59,16 +57,16 @@ pub trait ContractClassTrait {
 
 impl ContractClassImpl of ContractClassTrait {
     fn precalculate_address(
-        self: @ContractClass, constructor_calldata: @Array::<felt252>
+        self: @ContractClass, constructor_calldata: Span<felt252>
     ) -> ContractAddress {
-        let mut inputs: Array::<felt252> = _prepare_calldata(self.class_hash, constructor_calldata);
+        let mut inputs: Array<felt252> = _prepare_calldata(self.class_hash, constructor_calldata);
 
         let outputs = handle_cheatcode(cheatcode::<'precalculate_address'>(inputs.span()));
         (*outputs[0]).try_into().unwrap()
     }
 
     fn deploy(
-        self: @ContractClass, constructor_calldata: @Array::<felt252>
+        self: @ContractClass, constructor_calldata: Span<felt252>
     ) -> SyscallResult<(ContractAddress, Span<felt252>)> {
         let mut inputs = _prepare_calldata(self.class_hash, constructor_calldata);
 
@@ -87,9 +85,7 @@ impl ContractClassImpl of ContractClassTrait {
     }
 
     fn deploy_at(
-        self: @ContractClass,
-        constructor_calldata: @Array::<felt252>,
-        contract_address: ContractAddress
+        self: @ContractClass, constructor_calldata: Span<felt252>, contract_address: ContractAddress
     ) -> SyscallResult<(ContractAddress, Span<felt252>)> {
         let mut inputs = _prepare_calldata(self.class_hash, constructor_calldata);
         inputs.append(contract_address.into());
@@ -154,7 +150,7 @@ pub fn get_class_hash(contract_address: ContractAddress) -> ClassHash {
 }
 
 fn _prepare_calldata(
-    class_hash: @ClassHash, constructor_calldata: @Array::<felt252>
+    class_hash: @ClassHash, constructor_calldata: Span<felt252>
 ) -> Array::<felt252> {
     let class_hash: felt252 = class_hash.clone().into();
     let mut inputs: Array::<felt252> = array![class_hash];

diff --git a/snforge_std/src/cheatcodes/events.cairo b/snforge_std/src/cheatcodes/events.cairo
@@ -58,14 +58,14 @@ impl EventFetcherImpl of EventFetcher {
 }
 
 pub trait EventAssertions<T, impl TEvent: starknet::Event<T>, impl TDrop: Drop<T>> {
-    fn assert_emitted(ref self: EventSpy, events: @Array<(ContractAddress, T)>);
-    fn assert_not_emitted(ref self: EventSpy, events: @Array<(ContractAddress, T)>);
+    fn assert_emitted(ref self: EventSpy, events: Span<(ContractAddress, T)>);
+    fn assert_not_emitted(ref self: EventSpy, events: Span<(ContractAddress, T)>);
 }
 
 impl EventAssertionsImpl<
     T, impl TEvent: starknet::Event<T>, impl TDrop: Drop<T>
 > of EventAssertions<T> {
-    fn assert_emitted(ref self: EventSpy, events: @Array<(ContractAddress, T)>) {
+    fn assert_emitted(ref self: EventSpy, events: Span<(ContractAddress, T)>) {
         self.fetch_events();
 
         let mut i = 0;
@@ -86,7 +86,7 @@ impl EventAssertionsImpl<
         };
     }
 
-    fn assert_not_emitted(ref self: EventSpy, events: @Array<(ContractAddress, T)>) {
+    fn assert_not_emitted(ref self: EventSpy, events: Span<(ContractAddress, T)>) {
         self.fetch_events();
 
         let mut i = 0;