Skip to content

Commit

Permalink
chore(mempool): move account nonce decrease check to add tx test
Browse files Browse the repository at this point in the history
  • Loading branch information
ayeletstarkware committed Sep 22, 2024
1 parent c989925 commit 406a160
Showing 1 changed file with 19 additions and 6 deletions.
25 changes: 19 additions & 6 deletions crates/mempool/src/mempool_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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(
Expand All @@ -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]
Expand Down

0 comments on commit 406a160

Please sign in to comment.