From 406a1600deac03b8e16498a0909a8da29f6b8517 Mon Sep 17 00:00:00 2001 From: Ayelet Zilber Date: Wed, 18 Sep 2024 15:05:02 +0300 Subject: [PATCH] chore(mempool): move account nonce decrease check to add tx test --- crates/mempool/src/mempool_test.rs | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/crates/mempool/src/mempool_test.rs b/crates/mempool/src/mempool_test.rs index 491851c06..9158da8d6 100644 --- a/crates/mempool/src/mempool_test.rs +++ b/crates/mempool/src/mempool_test.rs @@ -490,7 +490,7 @@ fn test_add_tx_multi_nonce_success(mut mempool: Mempool) { let input_address_0_nonce_0 = add_tx_input!(tx_hash: 1, sender_address: "0x0", tx_nonce: 0_u8, account_nonce: 0_u8); let input_address_1_nonce_0 = - add_tx_input!(tx_hash: 2, sender_address: "0x1", tx_nonce: 0_u8,account_nonce: 0_u8); + add_tx_input!(tx_hash: 2, sender_address: "0x1", tx_nonce: 0_u8, account_nonce: 0_u8); let input_address_0_nonce_1 = add_tx_input!(tx_hash: 3, sender_address: "0x0", tx_nonce: 1_u8, account_nonce: 0_u8); @@ -537,11 +537,23 @@ fn test_add_tx_lower_than_queued_nonce() { let lower_nonce_input = add_tx_input!(tx_hash: 2, sender_address: "0x0", tx_nonce: 0_u8, account_nonce: 0_u8); - let queue_txs = [TransactionReference::new(&valid_input.tx)]; - let expected_mempool_content = MempoolContentBuilder::new().with_queue(queue_txs).build(); - let pool_txs = [valid_input.tx]; - let mut mempool = - MempoolContentBuilder::new().with_pool(pool_txs).with_queue(queue_txs).build_into_mempool(); + let MempoolInput { + tx: valid_input_tx, + account: Account { sender_address, state: AccountState { nonce } }, + } = valid_input; + let queue_txs = [TransactionReference::new(&valid_input_tx)]; + let account_nonces = [(sender_address, nonce)]; + let expected_mempool_content = MempoolContentBuilder::new() + .with_queue(queue_txs) + .with_account_nonces(account_nonces) + .build(); + + let pool_txs = [valid_input_tx]; + let mut mempool = MempoolContentBuilder::new() + .with_pool(pool_txs) + .with_queue(queue_txs) + .with_account_nonces(account_nonces) + .build_into_mempool(); // Test and assert the original transaction remains. add_tx_expect_error( @@ -553,6 +565,7 @@ fn test_add_tx_lower_than_queued_nonce() { }, ); expected_mempool_content.assert_eq_transaction_queue_content(&mempool); + expected_mempool_content.assert_eq_account_nonces(&mempool); } #[rstest]