diff --git a/crates/starknet_integration_tests/src/flow_test_setup.rs b/crates/starknet_integration_tests/src/flow_test_setup.rs index 6137fed859..c57e94bb2d 100644 --- a/crates/starknet_integration_tests/src/flow_test_setup.rs +++ b/crates/starknet_integration_tests/src/flow_test_setup.rs @@ -24,9 +24,9 @@ use tracing::{debug, instrument}; use crate::state_reader::{spawn_test_rpc_state_reader, StorageTestSetup}; use crate::utils::{ create_chain_info, - create_config, create_consensus_manager_configs_and_channels, create_mempool_p2p_configs, + create_node_config, }; const SEQUENCER_0: usize = 0; @@ -109,7 +109,7 @@ pub struct FlowSequencerSetup { pub state_sync_storage_file_handle: TempDir, // Node configuration. - pub config: SequencerNodeConfig, + pub node_config: SequencerNodeConfig, // Monitoring client. pub is_alive_test_client: IsAliveClient, @@ -137,7 +137,7 @@ impl FlowSequencerSetup { let component_config = ComponentConfig::default(); // Derive the configuration for the sequencer node. - let (config, _required_params) = create_config( + let (node_config, _required_params) = create_node_config( &mut available_ports, sequencer_index, chain_info, @@ -150,13 +150,13 @@ impl FlowSequencerSetup { ) .await; - debug!("Sequencer config: {:#?}", config); - let (_clients, servers) = create_node_modules(&config); + debug!("Sequencer config: {:#?}", node_config); + let (_clients, servers) = create_node_modules(&node_config); - let MonitoringEndpointConfig { ip, port, .. } = config.monitoring_endpoint_config; + let MonitoringEndpointConfig { ip, port, .. } = node_config.monitoring_endpoint_config; let is_alive_test_client = IsAliveClient::new(SocketAddr::from((ip, port))); - let HttpServerConfig { ip, port } = config.http_server_config; + let HttpServerConfig { ip, port } = node_config.http_server_config; let add_tx_http_client = HttpTestClient::new(SocketAddr::from((ip, port))); // Run the sequencer node. @@ -168,7 +168,7 @@ impl FlowSequencerSetup { batcher_storage_file_handle: storage_for_test.batcher_storage_handle, rpc_storage_file_handle: storage_for_test.rpc_storage_handle, state_sync_storage_file_handle: storage_for_test.state_sync_storage_handle, - config, + node_config, is_alive_test_client, } } diff --git a/crates/starknet_integration_tests/src/integration_test_setup.rs b/crates/starknet_integration_tests/src/integration_test_setup.rs index a5ca887aec..0f49378be2 100644 --- a/crates/starknet_integration_tests/src/integration_test_setup.rs +++ b/crates/starknet_integration_tests/src/integration_test_setup.rs @@ -25,9 +25,9 @@ use crate::config_utils::dump_config_file_changes; use crate::state_reader::{spawn_test_rpc_state_reader_with_socket, StorageTestSetup}; use crate::utils::{ create_chain_info, - create_config, create_consensus_manager_configs_and_channels, create_mempool_p2p_configs, + create_node_config, }; pub struct IntegrationTestSetup { @@ -164,7 +164,7 @@ impl IntegrationSequencerSetup { .await; // Derive the configuration for the sequencer node. - let (config, required_params) = create_config( + let (config, required_params) = create_node_config( available_ports, sequencer_index, chain_info, diff --git a/crates/starknet_integration_tests/src/utils.rs b/crates/starknet_integration_tests/src/utils.rs index edfbc02082..e9a8a5a30f 100644 --- a/crates/starknet_integration_tests/src/utils.rs +++ b/crates/starknet_integration_tests/src/utils.rs @@ -51,7 +51,7 @@ pub fn create_chain_info() -> ChainInfo { // TODO(yair, Tsabary): Create config presets for tests, then remove all the functions that modify // the config. #[allow(clippy::too_many_arguments)] -pub async fn create_config( +pub async fn create_node_config( available_ports: &mut AvailablePorts, sequencer_index: usize, chain_info: ChainInfo, diff --git a/crates/starknet_integration_tests/tests/end_to_end_flow_test.rs b/crates/starknet_integration_tests/tests/end_to_end_flow_test.rs index 6b350485c3..3585679040 100644 --- a/crates/starknet_integration_tests/tests/end_to_end_flow_test.rs +++ b/crates/starknet_integration_tests/tests/end_to_end_flow_test.rs @@ -83,7 +83,7 @@ async fn end_to_end_flow(mut tx_generator: MultiAccountTransactionGenerator) { let expected_validator_id = expected_proposer_iter .next() .unwrap() - .config + .node_config .consensus_manager_config .consensus_config .validator_id;