From 5f7171f1259a9fb5b89c27fbea02635fbd0e5cc4 Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Fri, 24 Mar 2023 20:38:51 +0100
Subject: [PATCH] chore(txpool): rename remove_invalid to remove_transactions
 (#1973)

---
 crates/transaction-pool/src/lib.rs         | 4 ++--
 crates/transaction-pool/src/pool/mod.rs    | 4 ++--
 crates/transaction-pool/src/pool/txpool.rs | 2 +-
 crates/transaction-pool/src/traits.rs      | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/crates/transaction-pool/src/lib.rs b/crates/transaction-pool/src/lib.rs
index e9bdfddc29..dd65c6f721 100644
--- a/crates/transaction-pool/src/lib.rs
+++ b/crates/transaction-pool/src/lib.rs
@@ -300,11 +300,11 @@ where
         Box::new(self.pool.best_transactions())
     }
 
-    fn remove_invalid(
+    fn remove_transactions(
         &self,
         hashes: impl IntoIterator<Item = TxHash>,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>> {
-        self.pool.remove_invalid(hashes)
+        self.pool.remove_transactions(hashes)
     }
 
     fn retain_unknown(&self, hashes: &mut Vec<TxHash>) {
diff --git a/crates/transaction-pool/src/pool/mod.rs b/crates/transaction-pool/src/pool/mod.rs
index bbcd5aa9d9..82d76bd5ee 100644
--- a/crates/transaction-pool/src/pool/mod.rs
+++ b/crates/transaction-pool/src/pool/mod.rs
@@ -347,11 +347,11 @@ where
     }
 
     /// Removes and returns all matching transactions from the pool.
-    pub(crate) fn remove_invalid(
+    pub(crate) fn remove_transactions(
         &self,
         hashes: impl IntoIterator<Item = TxHash>,
     ) -> Vec<Arc<ValidPoolTransaction<T::Transaction>>> {
-        let removed = self.pool.write().remove_invalid(hashes);
+        let removed = self.pool.write().remove_transactions(hashes);
 
         let mut listener = self.event_listener.write();
 
diff --git a/crates/transaction-pool/src/pool/txpool.rs b/crates/transaction-pool/src/pool/txpool.rs
index 5458d7ddc0..88994f9eda 100644
--- a/crates/transaction-pool/src/pool/txpool.rs
+++ b/crates/transaction-pool/src/pool/txpool.rs
@@ -303,7 +303,7 @@ impl<T: TransactionOrdering> TxPool<T> {
     }
 
     /// Removes and returns all matching transactions from the pool.
-    pub(crate) fn remove_invalid(
+    pub(crate) fn remove_transactions(
         &mut self,
         hashes: impl IntoIterator<Item = TxHash>,
     ) -> Vec<Arc<ValidPoolTransaction<T::Transaction>>> {
diff --git a/crates/transaction-pool/src/traits.rs b/crates/transaction-pool/src/traits.rs
index 7326503eaa..a7bc772ce6 100644
--- a/crates/transaction-pool/src/traits.rs
+++ b/crates/transaction-pool/src/traits.rs
@@ -111,7 +111,7 @@ pub trait TransactionPool: Send + Sync + Clone {
     /// Also removes all dependent transactions.
     ///
     /// Consumer: Block production
-    fn remove_invalid(
+    fn remove_transactions(
         &self,
         hashes: impl IntoIterator<Item = TxHash>,
     ) -> Vec<Arc<ValidPoolTransaction<Self::Transaction>>>;