apollo_integration_tests: remove redundant code

Author: nadin-Starkware

crates/apollo_integration_tests/src/bin/sequencer_node_setup.rs

@@ -33,16 +33,6 @@ async fn main() {
     )
     .await;
 
-    // TODO(Tsabary/Nadin): rename dir from "ports" to "config".
-    // TODO(Tsabary/Nadin): avoid the hard-coded file names, e.g., "node_"
-    let simulator_config_file = format!("{}/simulator_ports", args.output_base_dir);
-    info!("Generate simulator ports json files under {:?}", simulator_config_file);
-    create_dir_all(&simulator_config_file).await.unwrap();
-    for (node_index, node_setup) in test_manager.get_idle_nodes().iter() {
-        let path = format!("{}/node_{}", simulator_config_file, node_index);
-        node_setup.generate_simulator_ports_json(&path);
-    }
-
     info!("Node setup completed");
 }
 

crates/apollo_integration_tests/src/bin/sequencer_simulator.rs

@@ -76,25 +76,6 @@ fn read_ports_from_file(path: &str) -> (u16, u16) {
     (http_port, monitoring_port)
 }
 
-fn get_ports(args: &Args) -> (u16, u16) {
-    match (args.http_port, args.monitoring_port) {
-        (Some(http), Some(monitoring)) => (http, monitoring),
-        (None, None) => {
-            if let Some(ref path) = args.simulator_ports_path {
-                read_ports_from_file(path)
-            } else {
-                panic!(
-                    "Either both --http-port and --monitoring-port should be supplied, or a \
-                     --simulator-ports-path should be provided."
-                );
-            }
-        }
-        _ => panic!(
-            "Either supply both --http-port and --monitoring-port, or use --simulator-ports-path."
-        ),
-    }
-}
-
 async fn run_simulation(
     sequencer_simulator: &SequencerSimulator,
     tx_generator: &mut MultiAccountTransactionGenerator,
@@ -169,13 +150,10 @@ struct Args {
     monitoring_url: String,
 
     #[arg(long)]
-    simulator_ports_path: Option<String>,
-
-    #[arg(long)]
-    http_port: Option<u16>,
+    http_port: u16,
 
     #[arg(long)]
-    monitoring_port: Option<u16>,
+    monitoring_port: u16,
 
     #[arg(long, help = "Run the simulator in an infinite loop")]
     run_forever: bool,
@@ -204,7 +182,7 @@ async fn main() -> anyhow::Result<()> {
 
     let mut tx_generator = create_integration_test_tx_generator();
 
-    let (http_port, monitoring_port) = get_ports(&args);
+    let (http_port, monitoring_port) = (args.http_port, args.monitoring_port);
 
     let sequencer_simulator =
         SequencerSimulator::new(&args.http_url, http_port, &args.monitoring_url, monitoring_port);

crates/apollo_integration_tests/src/integration_test_manager.rs

@@ -100,7 +100,6 @@ pub struct NodeSetup {
     executables: Vec<ExecutableSetup>,
     // TODO(Nadin): remove these index fields once executables is migrated to a map
     batcher_index: usize,
-    http_server_index: usize,
     state_sync_index: usize,
     consensus_manager_index: usize,
 
@@ -118,7 +117,6 @@ impl NodeSetup {
     pub fn new(
         executables: Vec<ExecutableSetup>,
         batcher_index: usize,
-        http_server_index: usize,
         state_sync_index: usize,
         consensus_manager_index: usize,
         add_tx_http_client: HttpTestClient,
@@ -137,14 +135,12 @@ impl NodeSetup {
         }
 
         validate_index(batcher_index, len, "Batcher");
-        validate_index(http_server_index, len, "HTTP server");
         validate_index(state_sync_index, len, "State sync");
         validate_index(consensus_manager_index, len, "Consensus manager");
 
         Self {
             executables,
             batcher_index,
-            http_server_index,
             state_sync_index,
             consensus_manager_index,
             add_tx_http_client,
@@ -185,23 +181,11 @@ impl NodeSetup {
         }
     }
 
-    pub fn generate_simulator_ports_json(&self, path: &str) {
-        let json_data = serde_json::json!({
-            HTTP_PORT_ARG: self.executables[self.http_server_index].get_config().http_server_config.as_ref().expect("Should have http server config").port,
-            MONITORING_PORT_ARG: self.executables[self.batcher_index].get_config().monitoring_endpoint_config.as_ref().expect("Should have monitoring endpoint config").port
-        });
-        serialize_to_file(json_data, path);
-    }
-
     pub fn get_batcher_identifier(&self) -> usize {
         // TODO(Nadin): Change return type to service name.
         self.batcher_index
     }
 
-    pub fn get_http_server_index(&self) -> usize {
-        self.http_server_index
-    }
-
     pub fn get_state_sync_index(&self) -> usize {
         self.state_sync_index
     }
@@ -1012,7 +996,6 @@ async fn get_sequencer_setup_configs(
         nodes.push(NodeSetup::new(
             executables,
             batcher_index,
-            http_server_index,
             state_sync_index,
             consensus_manager_index,
             add_tx_http_client,