Add test for nested cheated calls

Author: cptartur

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

@@ -5,6 +5,37 @@ pub trait IHelloStarknet<TContractState> {
     fn get_block_number(self: @TContractState) -> u64;
 }
 
+#[starknet::interface]
+pub trait IHelloStarknetProxy<TContractState> {
+    fn get_block_number(self: @TContractState) -> u64;
+}
+
+#[starknet::contract]
+pub mod HelloStarknetProxy {
+    use starknet::ContractAddress;
+    use starknet::storage::{StoragePointerReadAccess, StoragePointerWriteAccess};
+    use crate::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait};
+
+    #[storage]
+    struct Storage {
+        address: ContractAddress,
+    }
+
+    #[constructor]
+    fn constructor(ref self: ContractState, address: ContractAddress) {
+        self.address.write(address);
+    }
+
+    #[abi(embed_v0)]
+    impl IHelloStarknetProxyImpl of super::IHelloStarknetProxy<ContractState> {
+        fn get_block_number(self: @ContractState) -> u64 {
+            let address = self.address.read();
+            let proxied = IHelloStarknetDispatcher { contract_address: address };
+            proxied.get_block_number()
+        }
+    }
+}
+
 #[starknet::contract]
 pub mod HelloStarknet {
     use core::array::ArrayTrait;

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

@@ -1,8 +1,12 @@
 use core::array::ArrayTrait;
 use core::result::ResultTrait;
-use simple_package_with_cheats::{IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait};
+use simple_package_with_cheats::{
+    IHelloStarknetDispatcher, IHelloStarknetDispatcherTrait, IHelloStarknetProxyDispatcher,
+    IHelloStarknetProxyDispatcherTrait,
+};
 use snforge_std::cheatcodes::contract_class::DeclareResultTrait;
 use snforge_std::{ContractClassTrait, declare, start_cheat_block_number_global};
+use starknet::contract_address;
 
 #[test]
 fn call_and_invoke() {
@@ -21,3 +25,24 @@ fn call_and_invoke() {
     let block_number = dispatcher.get_block_number();
     assert(block_number == 123, 'block_info == 123');
 }
+
+#[test]
+fn call_and_invoke_proxy() {
+    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 block_number = dispatcher.get_block_number();
+    assert(block_number == 2000, 'block_number == 2000');
+
+    start_cheat_block_number_global(123);
+
+    let block_number = dispatcher.get_block_number();
+    assert(block_number == 123, 'block_number == 123');
+}

crates/forge/tests/e2e/running.rs

@@ -63,10 +63,12 @@ fn simple_package_with_cheats() {
     [..]Finished[..]
 
 
-    Collected 1 test(s) from simple_package_with_cheats package
+    Collected 2 test(s) from simple_package_with_cheats package
     Running 0 test(s) from src/
-    Running 1 test(s) from tests/
+    Running 2 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 [..]
+    Tests: 2 passed, 0 failed, 0 ignored, 0 filtered out
     "},
     );
 }