github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-25 07:08:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: dedup prune_from_subpool (#15945)

Browse Source
This commit is contained in:
int88
2025-04-26 23:17:01 +08:00
committed by GitHub
parent 0a401d9cbf
commit 70e2fd5fb5
1 changed files with 1 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
crates/transaction-pool/src/pool/txpool.rs
View File

@@ -847,7 +847,7 @@ impl<T: TransactionOrdering> TxPool<T> {
tx_hash: &B256,
) -> Option<Arc<ValidPoolTransaction<T::Transaction>>> {
let (tx, pool) = self.all_transactions.remove_transaction_by_hash(tx_hash)?;
self.prune_from_subpool(pool, tx.id())
self.remove_from_subpool(pool, tx.id())
}
/// Removes the transaction from the given pool.
@@ -875,30 +875,6 @@ impl<T: TransactionOrdering> TxPool<T> {
tx
}
/// Removes the transaction from the given pool and advance sub-pool internal state, with the
/// expectation that the given transaction is included in a block.
fn prune_from_subpool(
&mut self,
pool: SubPool,
tx: &TransactionId,
) -> Option<Arc<ValidPoolTransaction<T::Transaction>>> {
let tx = match pool {
SubPool::Pending => self.pending_pool.remove_transaction(tx),
SubPool::Queued => self.queued_pool.remove_transaction(tx),
SubPool::BaseFee => self.basefee_pool.remove_transaction(tx),
SubPool::Blob => self.blob_pool.remove_transaction(tx),
};
if let Some(ref tx) = tx {
// We trace here instead of in subpool structs directly, because the `ParkedPool` type
// is generic and it would not be possible to distinguish whether a transaction is
// being pruned from the `BaseFee` pool, or the `Queued` pool.
trace!(target: "txpool", hash=%tx.transaction.hash(), ?pool, "Pruned transaction from a subpool");
}
tx
}
/// Removes _only_ the descendants of the given transaction from the __entire__ pool.
///
/// All removed transactions are added to the `removed` vec.