apollo_integration_tests: move common mod to end to end flow utils

ArniStarkware · ArniStarkware · commit 66ec65fa8054 · 2026-01-13T12:44:48.000+02:00
diff --git a/crates/apollo_integration_tests/Cargo.toml b/crates/apollo_integration_tests/Cargo.toml
@@ -64,7 +64,9 @@ futures.workspace = true
 hex.workspace = true
 indexmap.workspace = true
 mempool_test_utils.workspace = true
+metrics-exporter-prometheus.workspace = true
 papyrus_base_layer = { workspace = true, features = ["testing"] }
+pretty_assertions.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 starknet-types-core.workspace = true
@@ -83,9 +85,7 @@ apollo_l1_provider.workspace = true
 apollo_l1_provider_types = { workspace = true, features = ["testing"] }
 futures.workspace = true
 metrics.workspace = true
-metrics-exporter-prometheus.workspace = true
 mockall.workspace = true
-pretty_assertions.workspace = true
 rstest.workspace = true
 
 [[bin]]
diff --git a/crates/apollo_integration_tests/src/end_to_end_flow_utils.rs b/crates/apollo_integration_tests/src/end_to_end_flow_utils.rs
@@ -1,31 +1,22 @@
-// Each test module is compiled as a separate crate, and all can declare the common module.
-// This means that any peace of code in this module that is not used by *all* test modules will be
-// identified as unused code by clippy (for one of the crates).
-// TODO(Arni): Fix this.
-#![allow(dead_code)]
-
 use std::time::Duration;
 
 use apollo_batcher::metrics::REVERTED_TRANSACTIONS;
 use apollo_infra::trace_util::configure_tracing;
 use apollo_infra_utils::test_utils::TestIdentifier;
-use apollo_integration_tests::flow_test_setup::{
-    FlowSequencerSetup,
-    FlowTestSetup,
-    NUM_OF_SEQUENCERS,
-};
-use apollo_integration_tests::utils::{
+use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
+use pretty_assertions::assert_eq;
+use starknet_api::execution_resources::GasAmount;
+use starknet_api::transaction::TransactionHash;
+use tracing::info;
+
+use crate::flow_test_setup::{FlowSequencerSetup, FlowTestSetup, NUM_OF_SEQUENCERS};
+use crate::utils::{
     create_flow_test_tx_generator,
     run_test_scenario,
     CreateL1ToL2MessagesArgsFn,
     CreateRpcTxsFn,
     TestTxHashesFn,
 };
-use metrics_exporter_prometheus::{PrometheusBuilder, PrometheusHandle};
-use pretty_assertions::assert_eq;
-use starknet_api::execution_resources::GasAmount;
-use starknet_api::transaction::TransactionHash;
-use tracing::info;
 
 pub struct EndToEndFlowArgs {
     pub test_identifier: TestIdentifier,
diff --git a/crates/apollo_integration_tests/src/lib.rs b/crates/apollo_integration_tests/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod end_to_end_flow_utils;
 pub mod executable_setup;
 pub mod flow_test_setup;
 pub mod integration_test_manager;
diff --git a/crates/apollo_integration_tests/tests/bootstrap_declare.rs b/crates/apollo_integration_tests/tests/bootstrap_declare.rs
@@ -1,11 +1,13 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    test_single_tx,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use mempool_test_utils::starknet_api_test_utils::generate_bootstrap_declare;
 use starknet_api::execution_resources::GasAmount;
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 fn create_bootstrap_declare_scenario() -> TestScenario {
     TestScenario {
         create_rpc_txs_fn: |_| vec![generate_bootstrap_declare()],
diff --git a/crates/apollo_integration_tests/tests/declare_tx_flow_test.rs b/crates/apollo_integration_tests/tests/declare_tx_flow_test.rs
@@ -1,13 +1,15 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    test_single_tx,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::ACCOUNT_ID_0;
 use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::rpc_transaction::RpcTransaction;
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 // Uses end_to_end_flow with test identifier EndToEndFlowTest and instance indices [0, 1, 2].
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
diff --git a/crates/apollo_integration_tests/tests/deploy_account_and_invoke_flow_test.rs b/crates/apollo_integration_tests/tests/deploy_account_and_invoke_flow_test.rs
@@ -1,4 +1,10 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    validate_tx_count,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::{
     create_deploy_account_tx_and_invoke_tx,
     UNDEPLOYED_ACCOUNT_ID,
@@ -7,10 +13,6 @@ use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::rpc_transaction::RpcTransaction;
 
-use crate::common::{end_to_end_flow, validate_tx_count, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 // TODO(Meshi): Fail the test if no class have migrated.
 // Uses end_to_end_flow with test identifier EndToEndFlowTest and instance indices [3, 4, 5].
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
diff --git a/crates/apollo_integration_tests/tests/funding_txs_flow_test.rs b/crates/apollo_integration_tests/tests/funding_txs_flow_test.rs
@@ -1,13 +1,15 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    test_single_tx,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::{ACCOUNT_ID_0, UNDEPLOYED_ACCOUNT_ID};
 use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::rpc_transaction::RpcTransaction;
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 // Uses end_to_end_flow with test identifier EndToEndFlowTest and instance indices [6, 7, 8].
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
diff --git a/crates/apollo_integration_tests/tests/l1_to_l2_message_flow_test.rs b/crates/apollo_integration_tests/tests/l1_to_l2_message_flow_test.rs
@@ -1,11 +1,13 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    test_single_tx,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::create_l1_to_l2_messages_args;
 use blockifier::bouncer::BouncerWeights;
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 // Uses end_to_end_flow with test identifier EndToEndFlowTest and instance indices [9, 10, 11].
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
diff --git a/crates/apollo_integration_tests/tests/multiple_account_txs_flow_test.rs b/crates/apollo_integration_tests/tests/multiple_account_txs_flow_test.rs
@@ -1,14 +1,15 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::{ACCOUNT_ID_0, ACCOUNT_ID_1};
 use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::transaction::TransactionHash;
 
-use crate::common::{end_to_end_flow, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 // Uses end_to_end_flow with test identifier EndToEndFlowTest and instance indices [12, 13, 14].
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
diff --git a/crates/apollo_integration_tests/tests/reverted_l1_handler_tx_flow_test.rs b/crates/apollo_integration_tests/tests/reverted_l1_handler_tx_flow_test.rs
@@ -1,13 +1,15 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    test_single_tx,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::create_l1_to_l2_messages_args;
 use blockifier::bouncer::BouncerWeights;
 use mempool_test_utils::starknet_api_test_utils::MultiAccountTransactionGenerator;
 use starknet_api::transaction::L1HandlerTransaction;
 
-use crate::common::{end_to_end_flow, test_single_tx, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 /// Number of threads is 3 = Num of sequencer + 1 for the test thread.
 #[tokio::test(flavor = "multi_thread", worker_threads = 3)]
 async fn reverted_l1_handler_tx_flow() {
diff --git a/crates/apollo_integration_tests/tests/test_custom_cairo0_txs.rs b/crates/apollo_integration_tests/tests/test_custom_cairo0_txs.rs
@@ -1,4 +1,10 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    validate_tx_count,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::ACCOUNT_ID_1 as CAIRO0_ACCOUNT_ID;
 use blockifier_test_utils::cairo_versions::CairoVersion;
 use blockifier_test_utils::calldata::create_calldata;
@@ -14,10 +20,6 @@ use starknet_api::test_utils::invoke::rpc_invoke_tx;
 use starknet_api::transaction::fields::{ContractAddressSalt, TransactionSignature};
 use starknet_api::{calldata, felt};
 
-use crate::common::{end_to_end_flow, validate_tx_count, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 const CUSTOM_CAIRO_0_INVOKE_TX_COUNT: usize = 9;
 
 /// The test uses 3 threads: 1 for the test's main thread and 2 for the sequencers.
diff --git a/crates/apollo_integration_tests/tests/test_custom_cairo1_txs.rs b/crates/apollo_integration_tests/tests/test_custom_cairo1_txs.rs
@@ -1,4 +1,10 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    validate_tx_count,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 use apollo_integration_tests::utils::ACCOUNT_ID_0 as CAIRO1_ACCOUNT_ID;
 use blockifier::bouncer::BouncerWeights;
 use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
@@ -19,10 +25,6 @@ use starknet_api::transaction::TransactionVersion;
 use starknet_api::{calldata, felt};
 use starknet_types_core::felt::Felt;
 
-use crate::common::{end_to_end_flow, validate_tx_count, EndToEndFlowArgs, TestScenario};
-
-mod common;
-
 const CUSTOM_INVOKE_TX_COUNT: usize = 16;
 
 /// Test a wide range of different kinds of invoke transactions.
diff --git a/crates/apollo_integration_tests/tests/test_many.rs b/crates/apollo_integration_tests/tests/test_many.rs
@@ -1,13 +1,15 @@
 use apollo_infra_utils::test_utils::TestIdentifier;
+use apollo_integration_tests::end_to_end_flow_utils::{
+    end_to_end_flow,
+    validate_tx_count,
+    EndToEndFlowArgs,
+    TestScenario,
+};
 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 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.

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+pub mod end_to_end_flow_utils;`
`1`	`2`	`pub mod executable_setup;`
`2`	`3`	`pub mod flow_test_setup;`
`3`	`4`	`pub mod integration_test_manager;`