starknet_os_flow_tests: reduce boilerplate with add_funded_account_invoke

crates/starknet_os_flow_tests/src/test_manager.rs

@@ -58,6 +58,7 @@ use crate::initial_state::{
     OsExecutionContracts,
 };
 use crate::state_trait::FlowTestState;
+use crate::tests::NON_TRIVIAL_RESOURCE_BOUNDS;
 use crate::utils::{
     commit_state_diff,
     create_cached_state_input_and_commitment_infos,
@@ -308,6 +309,22 @@ impl<S: FlowTestState> TestManager<S> {
         self.add_invoke_tx(InvokeTransaction::create(invoke_tx(args), chain_id).unwrap());
     }
 
+    /// Similar to `add_invoke_tx_from_args`, but with the sender address set to the funded account,
+    /// nonce set (and incremented) and resource bounds set to the default (non-trivial).
+    /// Assumes the tx should not be reverted.
+    pub(crate) fn add_funded_account_invoke(&mut self, additional_args: InvokeTxArgs) {
+        let nonce = self.next_nonce(*FUNDED_ACCOUNT_ADDRESS);
+        self.add_invoke_tx_from_args(
+            InvokeTxArgs {
+                sender_address: *FUNDED_ACCOUNT_ADDRESS,
+                nonce,
+                resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
+                ..additional_args
+            },
+            &CHAIN_ID_FOR_TESTS,
+        );
+    }
+
     pub(crate) fn add_cairo0_declare_tx(
         &mut self,
         tx: DeclareTransaction,

crates/starknet_os_flow_tests/src/tests.rs

@@ -126,20 +126,14 @@ async fn declare_deploy_scenario(
         DEPLOY_CONTRACT_FUNCTION_ENTRY_POINT_NAME,
         &calldata,
     );
-    let invoke_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: test_manager.next_nonce(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: deploy_contract_calldata,
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
     let expected_contract_address = calculate_contract_address(
         contract_address_salt,
         class_hash,
         &Calldata(constructor_calldata[1..].to_vec().into()),
         *FUNDED_ACCOUNT_ADDRESS,
     )
     .unwrap();
-    test_manager.add_invoke_tx_from_args(invoke_tx_args, &CHAIN_ID_FOR_TESTS);
+    test_manager.add_funded_account_invoke(invoke_tx_args! { calldata: deploy_contract_calldata });
     test_manager.divide_transactions_into_n_blocks(n_blocks);
     let test_output = test_manager
         .execute_test_with_default_block_contexts(&TestParameters {
@@ -198,23 +192,13 @@ async fn trivial_diff_scenario(
     let value = Felt::from(11u8);
     let function_name = "test_storage_read_write";
     // Invoke a function on the test contract that changes the key to the new value.
-    let invoke_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: test_manager.next_nonce(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(test_contract_address, function_name, &[key, value]),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(invoke_tx_args, &CHAIN_ID_FOR_TESTS);
+    let calldata = create_calldata(test_contract_address, function_name, &[key, value]);
+    test_manager.add_funded_account_invoke(invoke_tx_args! { calldata });
 
     // Move to next block, and add an invoke that reverts the previous change.
     test_manager.move_to_next_block();
-    let invoke_tx_args = invoke_tx_args! {
-        sender_address: *FUNDED_ACCOUNT_ADDRESS,
-        nonce: test_manager.next_nonce(*FUNDED_ACCOUNT_ADDRESS),
-        calldata: create_calldata(test_contract_address, function_name, &[key, Felt::ZERO]),
-        resource_bounds: *NON_TRIVIAL_RESOURCE_BOUNDS,
-    };
-    test_manager.add_invoke_tx_from_args(invoke_tx_args, &CHAIN_ID_FOR_TESTS);
+    let calldata = create_calldata(test_contract_address, function_name, &[key, Felt::ZERO]);
+    test_manager.add_funded_account_invoke(invoke_tx_args! { calldata });
 
     // Execute the test.
     let test_output = test_manager