apollo_integration_tests: use validate_tx_count accross integration tests (#11503)

Author: ArniStarkware

crates/apollo_integration_tests/tests/common/mod.rs

@@ -177,6 +177,8 @@ pub async fn end_to_end_flow(args: EndToEndFlowArgs) {
 pub struct TestScenario {
     pub create_rpc_txs_fn: CreateRpcTxsFn,
     pub create_l1_to_l2_messages_args_fn: CreateL1ToL2MessagesArgsFn,
+    // TODO(Arni): replace with an optional apply shuffle to the tx hashes + a length assertion
+    // parameter.
     pub test_tx_hashes_fn: TestTxHashesFn,
 }
 
@@ -235,11 +237,9 @@ async fn wait_for_sequencer_node(sequencer: &FlowSequencerSetup) {
 }
 
 pub fn test_single_tx(tx_hashes: &[TransactionHash]) -> Vec<TransactionHash> {
-    assert_eq!(tx_hashes.len(), 1, "Expected a single transaction");
-    tx_hashes.to_vec()
+    validate_tx_count(tx_hashes, 1)
 }
 
-/// TODO(Itamar): Use this function in all tests built with TestScenario struct.
 #[track_caller]
 pub fn validate_tx_count(
     tx_hashes: &[TransactionHash],

crates/apollo_integration_tests/tests/end_to_end_flow_test.rs

@@ -11,7 +11,13 @@ use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerato
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::transaction::{L1HandlerTransaction, TransactionHash};
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
+use crate::common::{
+    end_to_end_flow,
+    test_single_tx,
+    validate_tx_count,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 
 mod common;
 
@@ -49,7 +55,7 @@ fn create_test_scenarios() -> Vec<TestScenario> {
         TestScenario {
             create_rpc_txs_fn: deploy_account_and_invoke,
             create_l1_to_l2_messages_args_fn: |_| vec![],
-            test_tx_hashes_fn: test_two_txs,
+            test_tx_hashes_fn: |tx_hashes| validate_tx_count(tx_hashes, 2),
         },
         TestScenario {
             create_rpc_txs_fn: create_declare_tx,
@@ -112,11 +118,6 @@ fn deploy_account_and_invoke(
     create_deploy_account_tx_and_invoke_tx(tx_generator, UNDEPLOYED_ACCOUNT_ID)
 }
 
-fn test_two_txs(tx_hashes: &[TransactionHash]) -> Vec<TransactionHash> {
-    assert_eq!(tx_hashes.len(), 2, "Expected two transactions");
-    tx_hashes.to_vec()
-}
-
 fn create_declare_tx(tx_generator: &mut MultiAccountTransactionGenerator) -> Vec<RpcTransaction> {
     let account_tx_generator = tx_generator.account_with_id_mut(ACCOUNT_ID_0);
     let declare_tx = account_tx_generator.generate_declare_of_contract_class();

crates/apollo_integration_tests/tests/test_many.rs

@@ -3,12 +3,13 @@ use apollo_integration_tests::utils::{create_invoke_txs, ACCOUNT_ID_1};
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::execution_resources::GasAmount;
 use starknet_api::rpc_transaction::RpcTransaction;
-use starknet_api::transaction::TransactionHash;
 
-use crate::common::{end_to_end_flow, EndToEndFlowArgs, TestScenario};
+use crate::common::{end_to_end_flow, validate_tx_count, EndToEndFlowArgs, TestScenario};
 
 mod common;
 
+const N_TXS: usize = 15;
+
 /// This test checks that at least one block is full.
 /// The test uses 3 threads: 1 for the test's main thread and 2 for the sequencers.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
@@ -29,23 +30,13 @@ fn create_many_txs_scenario() -> Vec<TestScenario> {
     vec![TestScenario {
         create_rpc_txs_fn: create_many_invoke_txs,
         create_l1_to_l2_messages_args_fn: |_| vec![],
-        test_tx_hashes_fn: test_many_invoke_txs,
+        test_tx_hashes_fn: |tx_hashes| validate_tx_count(tx_hashes, N_TXS),
     }]
 }
 
-pub fn test_many_invoke_txs(tx_hashes: &[TransactionHash]) -> Vec<TransactionHash> {
-    assert!(
-        tx_hashes.len() == 15,
-        "Unexpected number of transactions sent in the test scenario. Found {} transactions",
-        tx_hashes.len()
-    );
-    tx_hashes.to_vec()
-}
-
 /// Creates and sends more transactions than can fit in a block.
 pub fn create_many_invoke_txs(
     tx_generator: &mut MultiAccountTransactionGenerator,
 ) -> Vec<RpcTransaction> {
-    const N_TXS: usize = 15;
     create_invoke_txs(tx_generator, ACCOUNT_ID_1, N_TXS)
 }