chore(starknet_infra_utils): unify test util mods

commit-id:3470ac8e
starkware-libs · Jan 15, 2025 · 3ee1ee3 · 3ee1ee3
1 parent 0da5cb3
commit 3ee1ee3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 23 deletions.
diff --git a/crates/starknet_infra_utils/src/lib.rs b/crates/starknet_infra_utils/src/lib.rs
@@ -4,8 +4,6 @@ pub mod path;
 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;
diff --git a/crates/starknet_infra_utils/src/test_identifiers.rs b/crates/starknet_infra_utils/src/test_identifiers.rs
diff --git a/crates/starknet_infra_utils/src/test_utils.rs b/crates/starknet_infra_utils/src/test_utils.rs
@@ -16,6 +16,25 @@ const _: () = {
     );
 };
 
+#[derive(Debug, Copy, Clone)]
+pub enum TestIdentifier {
+    EndToEndIntegrationTest,
+    EndToEndFlowTest,
+    MempoolSendsTxToOtherPeerTest,
+    MempoolReceivesTxFromOtherPeerTest,
+}
+
+impl From<TestIdentifier> for u16 {
+    fn from(variant: TestIdentifier) -> Self {
+        match variant {
+            TestIdentifier::EndToEndIntegrationTest => 0,
+            TestIdentifier::EndToEndFlowTest => 1,
+            TestIdentifier::MempoolSendsTxToOtherPeerTest => 2,
+            TestIdentifier::MempoolReceivesTxFromOtherPeerTest => 3,
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AvailablePorts {
     current_port: u16,

diff --git a/crates/starknet_integration_tests/src/sequencer_manager.rs b/crates/starknet_integration_tests/src/sequencer_manager.rs
@@ -15,8 +15,11 @@ use starknet_api::rpc_transaction::RpcTransaction;
 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::test_utils::{
+    AvailablePorts,
+    TestIdentifier,
+    MAX_NUMBER_OF_INSTANCES_PER_TEST,
+};
 use starknet_infra_utils::tracing::{CustomLogger, TraceLevel};
 use starknet_sequencer_node::config::component_config::ComponentConfig;
 use starknet_sequencer_node::config::component_execution_config::{

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
@@ -18,7 +18,7 @@ use rstest::{fixture, rstest};
 use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::rpc_transaction::RpcTransaction;
 use starknet_api::transaction::TransactionHash;
-use starknet_infra_utils::test_identifiers::TestIdentifier;
+use starknet_infra_utils::test_utils::TestIdentifier;
 use starknet_integration_tests::flow_test_setup::{FlowSequencerSetup, FlowTestSetup};
 use starknet_integration_tests::utils::{
     create_funding_txs,