From 899dc3feadf9a077fcb4cd311d838449979f6f6c Mon Sep 17 00:00:00 2001 From: nadin-Starkware Date: Thu, 13 Feb 2025 15:56:32 +0200 Subject: [PATCH] chore(starknet_integration_tests): add verify_txs_accepted impl for the simulator commit-id:03dfa5c0 --- .../src/bin/sequencer_simulator.rs | 3 ++- .../src/sequencer_manager.rs | 2 +- .../src/sequencer_simulator_utils.rs | 22 ++++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/crates/starknet_integration_tests/src/bin/sequencer_simulator.rs b/crates/starknet_integration_tests/src/bin/sequencer_simulator.rs index 0aaf7c8f378..148360d2acd 100644 --- a/crates/starknet_integration_tests/src/bin/sequencer_simulator.rs +++ b/crates/starknet_integration_tests/src/bin/sequencer_simulator.rs @@ -39,7 +39,8 @@ async fn main() -> anyhow::Result<()> { sequencer_simulator.await_execution(EXPECTED_BLOCK_NUMBER).await; - // TODO(Nadin): verfy txs are accepted. + // TODO(Nadin): pass node index as an argument. + sequencer_simulator.verify_txs_accepted(0, &mut tx_generator, SENDER_ACCOUNT).await; info!("Simulation completed successfully"); diff --git a/crates/starknet_integration_tests/src/sequencer_manager.rs b/crates/starknet_integration_tests/src/sequencer_manager.rs index 4e5eedf46f6..986ab71c629 100644 --- a/crates/starknet_integration_tests/src/sequencer_manager.rs +++ b/crates/starknet_integration_tests/src/sequencer_manager.rs @@ -330,7 +330,7 @@ impl IntegrationTestManager { } } -fn nonce_to_usize(nonce: Nonce) -> usize { +pub fn nonce_to_usize(nonce: Nonce) -> usize { let prefixed_hex = nonce.0.to_hex_string(); let unprefixed_hex = prefixed_hex.split_once("0x").unwrap().1; usize::from_str_radix(unprefixed_hex, 16).unwrap() diff --git a/crates/starknet_integration_tests/src/sequencer_simulator_utils.rs b/crates/starknet_integration_tests/src/sequencer_simulator_utils.rs index c9b0cfe7865..4bb7f4803f4 100644 --- a/crates/starknet_integration_tests/src/sequencer_simulator_utils.rs +++ b/crates/starknet_integration_tests/src/sequencer_simulator_utils.rs @@ -12,6 +12,7 @@ use starknet_sequencer_node::utils::load_and_validate_config; use tracing::info; use crate::monitoring_utils; +use crate::sequencer_manager::nonce_to_usize; use crate::utils::{send_account_txs, TestScenario}; pub struct SequencerSimulator { @@ -55,8 +56,23 @@ impl SequencerSimulator { .await; } - // TODO(Nadin): Implement this function. - pub async fn verify_txs_accepted(&self) { - unimplemented!(); + pub async fn verify_txs_accepted( + &self, + sequencer_idx: usize, + tx_generator: &mut MultiAccountTransactionGenerator, + sender_account: AccountId, + ) { + let account = tx_generator.account_with_id(sender_account); + let expected_n_batched_txs = nonce_to_usize(account.get_nonce()); + info!( + "Verifying that sequencer {} got {} batched txs.", + sequencer_idx, expected_n_batched_txs + ); + monitoring_utils::verify_txs_accepted( + &self.monitoring_client, + sequencer_idx, + expected_n_batched_txs, + ) + .await; } }