chore(starknet_infra_utils): move fn from integration test

commit-id:81ec4ffa

crates/starknet_infra_utils/Cargo.toml

@@ -7,7 +7,7 @@ license-file.workspace = true
 description = "Infrastructure utility."
 
 [features]
-testing = []
+testing = ["tokio/net"]
 
 [lints]
 workspace = true

crates/starknet_infra_utils/src/lib.rs

@@ -5,5 +5,7 @@ pub mod run_until;
 pub mod tasks;
 #[cfg(any(feature = "testing", test))]
 pub mod test_identifiers;
+#[cfg(any(feature = "testing", test))]
+pub mod test_utils;
 pub mod tracing;
 pub mod type_name;

crates/starknet_integration_tests/src/flow_test_setup.rs

@@ -18,10 +18,10 @@ use starknet_consensus_manager::config::ConsensusManagerConfig;
 use starknet_gateway_types::errors::GatewaySpecError;
 use starknet_http_server::config::HttpServerConfig;
 use starknet_http_server::test_utils::HttpTestClient;
+use starknet_infra_utils::test_utils::AvailablePorts;
 use starknet_mempool_p2p::config::MempoolP2pConfig;
 use starknet_monitoring_endpoint::config::MonitoringEndpointConfig;
 use starknet_monitoring_endpoint::test_utils::MonitoringClient;
-use starknet_sequencer_infra::test_utils::AvailablePorts;
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::config::node_config::SequencerNodeConfig;
 use starknet_sequencer_node::servers::run_component_servers;

crates/starknet_integration_tests/src/integration_test_setup.rs

@@ -9,10 +9,10 @@ use starknet_api::transaction::TransactionHash;
 use starknet_consensus_manager::config::ConsensusManagerConfig;
 use starknet_http_server::config::HttpServerConfig;
 use starknet_http_server::test_utils::HttpTestClient;
+use starknet_infra_utils::test_utils::AvailablePorts;
 use starknet_mempool_p2p::config::MempoolP2pConfig;
 use starknet_monitoring_endpoint::config::MonitoringEndpointConfig;
 use starknet_monitoring_endpoint::test_utils::MonitoringClient;
-use starknet_sequencer_infra::test_utils::AvailablePorts;
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::test_utils::node_runner::NodeRunner;
 use starknet_state_sync::config::StateSyncConfig;

crates/starknet_integration_tests/src/sequencer_manager.rs

@@ -16,8 +16,8 @@ use starknet_api::state::StateNumber;
 use starknet_api::transaction::TransactionHash;
 use starknet_infra_utils::run_until::run_until;
 use starknet_infra_utils::test_identifiers::TestIdentifier;
+use starknet_infra_utils::test_utils::{AvailablePorts, MAX_NUMBER_OF_INSTANCES_PER_TEST};
 use starknet_infra_utils::tracing::{CustomLogger, TraceLevel};
-use starknet_sequencer_infra::test_utils::{AvailablePorts, MAX_NUMBER_OF_INSTANCES_PER_TEST};
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::config::component_execution_config::{
     ActiveComponentExecutionConfig,

crates/starknet_integration_tests/src/utils.rs

@@ -34,9 +34,9 @@ use starknet_gateway::config::{
     StatelessTransactionValidatorConfig,
 };
 use starknet_http_server::test_utils::create_http_server_config;
+use starknet_infra_utils::test_utils::AvailablePorts;
 use starknet_mempool_p2p::config::MempoolP2pConfig;
 use starknet_monitoring_endpoint::config::MonitoringEndpointConfig;
-use starknet_sequencer_infra::test_utils::AvailablePorts;
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::config::config_utils::{
     EthereumBaseLayerConfigRequiredParams,

crates/starknet_sequencer_infra/Cargo.toml

@@ -31,3 +31,4 @@ validator.workspace = true
 assert_matches.workspace = true
 pretty_assertions.workspace = true
 starknet-types-core.workspace = true
+starknet_infra_utils = { workspace = true, features = ["testing"] }

crates/starknet_sequencer_infra/src/lib.rs

@@ -3,8 +3,6 @@ pub mod component_definitions;
 pub mod component_server;
 pub mod errors;
 pub mod serde_utils;
-#[cfg(any(feature = "testing", test))]
-pub mod test_utils;
 #[cfg(test)]
 pub mod tests;
 pub mod trace_util;

crates/starknet_sequencer_infra/src/tests/remote_component_client_server_test.rs

@@ -10,6 +10,7 @@ use hyper::{Body, Client, Request, Response, Server, StatusCode, Uri};
 use rstest::rstest;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
+use starknet_infra_utils::test_utils::get_available_socket;
 use starknet_types_core::felt::Felt;
 use tokio::sync::mpsc::channel;
 use tokio::sync::Mutex;
@@ -34,7 +35,6 @@ use crate::component_server::{
     RemoteComponentServer,
 };
 use crate::serde_utils::SerdeWrapper;
-use crate::test_utils::get_available_socket;
 use crate::tests::{
     test_a_b_functionality,
     ComponentA,