refactor(starknet_integration_tests): rename SequencerSetupManager (#3462)

* refactor(starknet_integration_tests): rename SequencerSetup

commit-id:87c8d1a8

* refactor(starknet_integration_tests): rename SequencerSetupManager

commit-id:50b87cd4

Author: nadin-Starkware

crates/starknet_integration_tests/src/end_to_end_integration.rs

@@ -3,7 +3,7 @@ use starknet_api::block::BlockNumber;
 use starknet_sequencer_node::test_utils::node_runner::get_node_executable_path;
 use tracing::info;
 
-use crate::sequencer_manager::{get_sequencer_setup_configs, SequencerSetupManager};
+use crate::sequencer_manager::{get_sequencer_setup_configs, IntegrationTestManager};
 
 pub async fn end_to_end_integration(tx_generator: MultiAccountTransactionGenerator) {
     const EXPECTED_BLOCK_NUMBER: BlockNumber = BlockNumber(15);
@@ -20,16 +20,18 @@ pub async fn end_to_end_integration(tx_generator: MultiAccountTransactionGenerat
     // Run the sequencers.
     // TODO(Nadin, Tsabary): Refactor to separate the construction of SequencerManager from its
     // invocation. Consider using the builder pattern.
-    let sequencer_manager = SequencerSetupManager::run(sequencers_setup).await;
+    let integration_test_manager = IntegrationTestManager::run(sequencers_setup).await;
 
     // Run the integration test simulator.
-    sequencer_manager.run_integration_test_simulator(tx_generator, N_TXS, SENDER_ACCOUNT).await;
+    integration_test_manager
+        .run_integration_test_simulator(tx_generator, N_TXS, SENDER_ACCOUNT)
+        .await;
 
-    sequencer_manager.await_execution(EXPECTED_BLOCK_NUMBER).await;
+    integration_test_manager.await_execution(EXPECTED_BLOCK_NUMBER).await;
 
     info!("Shutting down nodes.");
-    sequencer_manager.shutdown_nodes();
+    integration_test_manager.shutdown_nodes();
 
     // Verify the results.
-    sequencer_manager.verify_results(sender_address, N_TXS).await;
+    integration_test_manager.verify_results(sender_address, N_TXS).await;
 }

crates/starknet_integration_tests/src/integration_test_setup.rs

@@ -47,7 +47,7 @@ impl From<SequencerExecutionId> for NodeRunner {
     }
 }
 
-pub struct SequencerSetup {
+pub struct ExecutableSetup {
     // Sequencer test identifier.
     pub sequencer_execution_id: SequencerExecutionId,
     // Client for adding transactions to the sequencer node.
@@ -73,7 +73,7 @@ pub struct SequencerSetup {
 
 // TODO(Tsabary/ Nadin): reduce number of args.
 #[allow(clippy::too_many_arguments)]
-impl SequencerSetup {
+impl ExecutableSetup {
     #[instrument(skip(accounts, chain_info, consensus_manager_config), level = "debug")]
     pub async fn new(
         accounts: Vec<AccountTransactionGenerator>,

crates/starknet_integration_tests/src/sequencer_manager.rs

@@ -31,7 +31,7 @@ use starknet_types_core::felt::Felt;
 use tokio::task::JoinHandle;
 use tracing::info;
 
-use crate::integration_test_setup::{SequencerExecutionId, SequencerSetup};
+use crate::integration_test_setup::{ExecutableSetup, SequencerExecutionId};
 use crate::utils::{
     create_chain_info,
     create_consensus_manager_configs_from_network_configs,
@@ -64,13 +64,13 @@ impl ComposedComponentConfigs {
     }
 }
 
-pub struct SequencerSetupManager {
-    pub sequencers: Vec<SequencerSetup>,
+pub struct IntegrationTestManager {
+    pub sequencers: Vec<ExecutableSetup>,
     pub sequencer_run_handles: Vec<JoinHandle<()>>,
 }
 
-impl SequencerSetupManager {
-    pub async fn run(sequencers: Vec<SequencerSetup>) -> Self {
+impl IntegrationTestManager {
+    pub async fn run(sequencers: Vec<ExecutableSetup>) -> Self {
         info!("Running sequencers.");
         let sequencer_run_handles = sequencers
             .iter()
@@ -192,7 +192,7 @@ async fn await_block(
 
 pub(crate) async fn get_sequencer_setup_configs(
     tx_generator: &MultiAccountTransactionGenerator,
-) -> Vec<SequencerSetup> {
+) -> Vec<ExecutableSetup> {
     let test_unique_id = TestIdentifier::EndToEndIntegrationTest;
 
     // TODO(Nadin): Assign a dedicated set of available ports to each sequencer.
@@ -224,7 +224,7 @@ pub(crate) async fn get_sequencer_setup_configs(
     );
 
     // TODO(Nadin): define the test storage here and pass it to the create_state_sync_configs and to
-    // the SequencerSetup
+    // the ExecutableSetup
     let state_sync_configs = create_state_sync_configs(
         StorageConfig::default(),
         available_ports.get_next_ports(n_distributed_sequencers),
@@ -275,7 +275,7 @@ pub(crate) async fn get_sequencer_setup_configs(
         )| {
             let chain_info = chain_info.clone();
             async move {
-                SequencerSetup::new(
+                ExecutableSetup::new(
                     accounts.to_vec(),
                     sequencer_execution_id,
                     chain_info,