From bfe12ce8853805b3074184d4beda62fa48db977e Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Sat, 16 Dec 2023 18:32:59 +0100 Subject: [PATCH] chore: log full tx object in assert (#5797) --- crates/transaction-pool/src/pool/blob.rs | 2 +- crates/transaction-pool/src/pool/parked.rs | 2 +- crates/transaction-pool/src/pool/pending.rs | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/crates/transaction-pool/src/pool/blob.rs b/crates/transaction-pool/src/pool/blob.rs index fb5ae3c884..0404626391 100644 --- a/crates/transaction-pool/src/pool/blob.rs +++ b/crates/transaction-pool/src/pool/blob.rs @@ -47,7 +47,7 @@ impl BlobTransactions { pub(crate) fn add_transaction(&mut self, tx: Arc>) { assert!(tx.is_eip4844(), "transaction is not a blob tx"); let id = *tx.id(); - assert!(!self.contains(&id), "transaction already included {:?}", self.contains(&id)); + assert!(!self.contains(&id), "transaction already included {:?}", self.get(&id).unwrap()); let submission_id = self.next_id(); // keep track of size diff --git a/crates/transaction-pool/src/pool/parked.rs b/crates/transaction-pool/src/pool/parked.rs index 6d8b153f40..e64770927b 100644 --- a/crates/transaction-pool/src/pool/parked.rs +++ b/crates/transaction-pool/src/pool/parked.rs @@ -51,7 +51,7 @@ impl ParkedPool { assert!( !self.contains(&id), "transaction already included {:?}", - self.get(&id).unwrap().transaction.hash() + self.get(&id).unwrap().transaction.transaction ); let submission_id = self.next_id(); diff --git a/crates/transaction-pool/src/pool/pending.rs b/crates/transaction-pool/src/pool/pending.rs index 00cf648127..6a7b0409e7 100644 --- a/crates/transaction-pool/src/pool/pending.rs +++ b/crates/transaction-pool/src/pool/pending.rs @@ -289,7 +289,7 @@ impl PendingPool { assert!( !self.contains(tx.id()), "transaction already included {:?}", - self.get(tx.id()).unwrap().transaction.hash() + self.get(tx.id()).unwrap().transaction ); // keep track of size @@ -507,8 +507,9 @@ impl PendingPool { self.highest_nonces.len() <= self.all.len(), "independent_descendants.len() > all.len()" ); - assert!( - self.highest_nonces.len() == self.independent_transactions.len(), + assert_eq!( + self.highest_nonces.len(), + self.independent_transactions.len(), "independent.len() = independent_descendants.len()" ); }