diff --git a/crates/starknet_integration_tests/src/monitoring_utils.rs b/crates/starknet_integration_tests/src/monitoring_utils.rs index aad92a2961..39ec174ce7 100644 --- a/crates/starknet_integration_tests/src/monitoring_utils.rs +++ b/crates/starknet_integration_tests/src/monitoring_utils.rs @@ -57,3 +57,20 @@ pub async fn await_execution(node: &NodeSetup, expected_block_number: BlockNumbe .await .expect("Block number should have been reached."); } + +pub async fn verify_txs_accepted( + monitoring_client: &MonitoringClient, + sequencer_idx: usize, + expected_n_batched_txs: usize, +) { + info!("Verifying that sequencer {sequencer_idx} got {expected_n_batched_txs} batched txs."); + let n_batched_txs = monitoring_client + .get_metric::(metric_definitions::BATCHED_TRANSACTIONS.get_name()) + .await + .expect("Failed to get batched txs metric."); + assert_eq!( + n_batched_txs, expected_n_batched_txs, + "Sequencer {sequencer_idx} got an unexpected number of batched txs. Expected \ + {expected_n_batched_txs} got {n_batched_txs}" + ); +} diff --git a/crates/starknet_integration_tests/src/sequencer_manager.rs b/crates/starknet_integration_tests/src/sequencer_manager.rs index 6315b8525c..9dbedde658 100644 --- a/crates/starknet_integration_tests/src/sequencer_manager.rs +++ b/crates/starknet_integration_tests/src/sequencer_manager.rs @@ -28,7 +28,7 @@ use tokio::task::JoinHandle; use tracing::info; use crate::integration_test_setup::{ExecutableSetup, NodeExecutionId}; -use crate::monitoring_utils::await_execution; +use crate::monitoring_utils::{await_execution, verify_txs_accepted}; use crate::utils::{ create_chain_info, create_consensus_manager_configs_from_network_configs, @@ -315,16 +315,7 @@ impl IntegrationTestManager { let (sequencer_idx, monitoring_client) = self.running_batcher_monitoring_client(); let account = self.tx_generator.account_with_id(sender_account); let expected_n_batched_txs = nonce_to_usize(account.get_nonce()); - info!("Verifying that sequencer {sequencer_idx} got {expected_n_batched_txs} batched txs."); - let n_batched_txs = monitoring_client - .get_metric::(metric_definitions::BATCHED_TRANSACTIONS.get_name()) - .await - .expect("Failed to get batched txs metric."); - assert_eq!( - n_batched_txs, expected_n_batched_txs, - "Sequencer {sequencer_idx} got an unexpected number of batched txs. Expected \ - {expected_n_batched_txs} got {n_batched_txs}" - ); + verify_txs_accepted(monitoring_client, sequencer_idx, expected_n_batched_txs).await; } }