Add tests for deploy_syscall

Author: cptartur

crates/forge/tests/data/simple_package_with_cheats/src/lib.cairo

@@ -1,21 +1,55 @@
+use starknet::{ClassHash, ContractAddress};
+
 #[starknet::interface]
 pub trait IHelloStarknet<TContractState> {
     fn increase_balance(ref self: TContractState, amount: felt252);
     fn get_balance(self: @TContractState) -> felt252;
     fn get_block_number(self: @TContractState) -> u64;
 }
 
+#[starknet::interface]
+pub trait ICheatedConstructor<TContractState> {
+    fn get_stored_block_number(self: @TContractState) -> u64;
+}
+
+#[starknet::contract]
+pub mod CheatedConstructor {
+    use starknet::get_block_number;
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
+
+    #[storage]
+    struct Storage {
+        block_number: u64,
+    }
+
+    #[constructor]
+    fn constructor(ref self: ContractState) {
+        let block_number = get_block_number();
+        self.block_number.write(block_number);
+    }
+
+    #[abi(embed_v0)]
+    impl ICheatedConstructorImpl of super::ICheatedConstructor<ContractState> {
+        fn get_stored_block_number(self: @ContractState) -> u64 {
+            self.block_number.read()
+        }
+    }
+}
+
 #[starknet::interface]
 pub trait IHelloStarknetProxy<TContractState> {
     fn get_block_number(self: @TContractState) -> u64;
     fn get_block_number_library_call(self: @TContractState) -> u64;
+    fn deploy_cheated_constructor_contract(
+        ref self: TContractState, class_hash: ClassHash, salt: felt252,
+    ) -> ContractAddress;
 }
 
 #[starknet::contract]
 pub mod HelloStarknetProxy {
-    use starknet::ContractAddress;
     use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
-    use starknet::syscalls::get_class_hash_at_syscall;
+    use starknet::syscalls::{deploy_syscall, get_class_hash_at_syscall};
+    use starknet::{ClassHash, ContractAddress};
     use crate::{
         IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetLibraryDispatcher,
     };
@@ -44,6 +78,13 @@ pub mod HelloStarknetProxy {
             let library_dispatcher = IHelloStarknetLibraryDispatcher { class_hash };
             library_dispatcher.get_block_number()
         }
+
+        fn deploy_cheated_constructor_contract(
+            ref self: ContractState, class_hash: ClassHash, salt: felt252,
+        ) -> ContractAddress {
+            let (address, _) = deploy_syscall(class_hash, salt, array![].span(), false).unwrap();
+            address
+        }
     }
 }
 

crates/forge/tests/data/simple_package_with_cheats/tests/contract.cairo

@@ -1,7 +1,8 @@
 use core::array::ArrayTrait;
 use core::result::ResultTrait;
 use simple_package_with_cheats::{
-    IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetProxyDispatcher,
+    ICheatedConstructorDispatcher, ICheatedConstructorDispatcherTrait, IHelloStarknetDispatcher,
+    IHelloStarknetDispatcherTrait, IHelloStarknetProxyDispatcher,
     IHelloStarknetProxyDispatcherTrait,
 };
 use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
@@ -67,3 +68,30 @@ fn call_and_invoke_library_call() {
     let block_number = dispatcher.get_block_number_library_call();
     assert(block_number == 123, 'block_number == 123');
 }
+
+#[test]
+fn deploy_syscall() {
+    let contract = declare("HelloStarknet").unwrap().contract_class();
+    let constructor_calldata = @ArrayTrait::new();
+    let (contract_address, _) = contract.deploy(constructor_calldata).unwrap();
+
+    let proxy_contract = declare("HelloStarknetProxy").unwrap().contract_class();
+    let mut constructor_calldata = ArrayTrait::new();
+    contract_address.serialize(ref constructor_calldata);
+    let (proxy_contract_address, _) = proxy_contract.deploy(@constructor_calldata).unwrap();
+    let dispatcher = IHelloStarknetProxyDispatcher { contract_address: proxy_contract_address };
+
+    let class_hash = declare("CheatedConstructor").unwrap().contract_class().class_hash;
+
+    let contract_address = dispatcher.deploy_cheated_constructor_contract(*class_hash, 111);
+    let cheated_constructor_dispatcher = ICheatedConstructorDispatcher { contract_address };
+    let block_number = cheated_constructor_dispatcher.get_stored_block_number();
+    assert(block_number == 2000, 'block_number == 2000');
+
+    start_cheat_block_number_global(123);
+
+    let contract_address = dispatcher.deploy_cheated_constructor_contract(*class_hash, 222);
+    let cheated_constructor_dispatcher = ICheatedConstructorDispatcher { contract_address };
+    let block_number = cheated_constructor_dispatcher.get_stored_block_number();
+    assert(block_number == 123, 'block_number == 123');
+}

crates/forge/tests/e2e/running.rs

@@ -63,13 +63,14 @@ fn simple_package_with_cheats() {
     [..]Finished[..]
 
 
-    Collected 3 test(s) from simple_package_with_cheats package
+    Collected 4 test(s) from simple_package_with_cheats package
     Running 0 test(s) from src/
-    Running 3 test(s) from tests/
+    Running 4 test(s) from tests/
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke [..]
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_proxy [..]
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_library_call [..]
-    Tests: 3 passed, 0 failed, 0 ignored, 0 filtered out
+    [PASS] simple_package_with_cheats_integrationtest::contract::deploy_syscall [..]
+    Tests: 4 passed, 0 failed, 0 ignored, 0 filtered out
     "},
     );
 }