From f0a95689a42be9a8301928a77af60dd15c9b136e Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Sun, 26 Mar 2023 17:18:44 +0200
Subject: [PATCH] chore(txpool): include tx object in assert message (#1989)

---
 crates/transaction-pool/src/pool/parked.rs  | 6 +++++-
 crates/transaction-pool/src/pool/pending.rs | 6 +++++-
 crates/transaction-pool/src/pool/txpool.rs  | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/crates/transaction-pool/src/pool/parked.rs b/crates/transaction-pool/src/pool/parked.rs
index b931d83d47..cd8d94f8e9 100644
--- a/crates/transaction-pool/src/pool/parked.rs
+++ b/crates/transaction-pool/src/pool/parked.rs
@@ -40,7 +40,11 @@ impl<T: ParkedOrd> ParkedPool<T> {
     /// If the transaction is already included.
     pub(crate) fn add_transaction(&mut self, tx: Arc<ValidPoolTransaction<T::Transaction>>) {
         let id = *tx.id();
-        assert!(!self.by_id.contains_key(&id), "transaction already included");
+        assert!(
+            !self.by_id.contains_key(&id),
+            "transaction already included {:?}",
+            self.by_id.contains_key(&id)
+        );
         let submission_id = self.next_id();
 
         // keep track of size
diff --git a/crates/transaction-pool/src/pool/pending.rs b/crates/transaction-pool/src/pool/pending.rs
index 1efdde6dec..1a27ba6687 100644
--- a/crates/transaction-pool/src/pool/pending.rs
+++ b/crates/transaction-pool/src/pool/pending.rs
@@ -97,7 +97,11 @@ impl<T: TransactionOrdering> PendingPool<T> {
     ///
     /// if the transaction is already included
     pub(crate) fn add_transaction(&mut self, tx: Arc<ValidPoolTransaction<T::Transaction>>) {
-        assert!(!self.by_id.contains_key(tx.id()), "transaction already included");
+        assert!(
+            !self.by_id.contains_key(tx.id()),
+            "transaction already included {:?}",
+            self.by_id.contains_key(tx.id())
+        );
 
         let tx_id = *tx.id();
         let submission_id = self.next_id();
diff --git a/crates/transaction-pool/src/pool/txpool.rs b/crates/transaction-pool/src/pool/txpool.rs
index b8c684f6f5..c063ef385f 100644
--- a/crates/transaction-pool/src/pool/txpool.rs
+++ b/crates/transaction-pool/src/pool/txpool.rs
@@ -865,7 +865,7 @@ impl<T: PoolTransaction> AllTransactions<T> {
 
         let pool_tx = PoolInternalTransaction {
             transaction: transaction.clone(),
-            subpool: SubPool::Queued,
+            subpool: state.into(),
             state,
             cumulative_cost,
         };