Remove option from remove_transactions

Author: AurelienFT

crates/services/txpool_v2/src/pool.rs

@@ -354,7 +354,7 @@ where
 
     /// Remove transaction but keep its dependents.
     /// The dependents become executables.
-    pub fn remove_transactions(&mut self, tx_ids: Vec<TxId>) -> Vec<Option<ArcPoolTx>> {
+    pub fn remove_transactions(&mut self, tx_ids: Vec<TxId>) -> Vec<ArcPoolTx> {
         let mut removed_transactions = Vec::with_capacity(tx_ids.len());
         for tx_id in tx_ids {
             if let Some(storage_id) = self.tx_id_to_storage_id.remove(&tx_id) {
@@ -384,9 +384,7 @@ where
                         .new_executable_transaction(dependent, storage_data);
                 }
                 self.update_components_and_caches_on_removal(iter::once(&transaction));
-                removed_transactions.push(Some(transaction.transaction));
-            } else {
-                removed_transactions.push(None);
+                removed_transactions.push(transaction.transaction);
             }
         }
 

crates/services/txpool_v2/src/service.rs

@@ -329,7 +329,7 @@ where
         };
         if !removed_transactions.is_empty() {
             let mut height_expiration_txs = self.pruner.height_expiration_txs.write();
-            for tx in removed_transactions.into_iter().flatten() {
+            for tx in removed_transactions.into_iter() {
                 let expiration = tx.expiration();
                 if expiration < u32::MAX.into() {
                     if let Some(expired_txs) = height_expiration_txs.get_mut(&expiration)