Adds rpc method for anvil to drop all pending transactions #7643
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mattsse
requested changes
Apr 12, 2024
crates/anvil/src/eth/pool/mod.rs
Outdated
Comment on lines
171
to
176
| let mut transactions_iterator = pool.pending_transactions.transactions(); | ||
|
|
||
| while let Some(pool_transaction) = transactions_iterator.next() { | ||
| let tx_hash = pool_transaction.as_ref().hash(); | ||
| self.drop_transaction(tx_hash); | ||
| } |
There was a problem hiding this comment.
hmm, I think we want a fn clear on both tx sets
foundry/crates/anvil/src/eth/pool/mod.rs
Lines 202 to 203 in d8a1625
that clear all maps
|
@mattsse thank you for the quick review! if I understand you correctly, we want to clear both pending and ready transactions in the drop all transactions method? |
|
Now iterating over the ready transactions map and dropping them too. |
mattsse
requested changes
Apr 12, 2024
crates/anvil/src/eth/pool/mod.rs
Outdated
Comment on lines
169
to
184
| pub fn drop_all_transactions(&self) { | ||
| let pool = self.inner.write(); | ||
|
|
||
| let pending_transactions = pool.pending_transactions.transactions(); | ||
| let ready_transactions = pool.ready_transactions.get_transactions(); | ||
|
|
||
| pending_transactions.for_each(|pool_transaction| { | ||
| let tx_hash = pool_transaction.as_ref().hash(); | ||
| self.drop_transaction(tx_hash); | ||
| }); | ||
|
|
||
| ready_transactions.for_each(|pool_transaction| { | ||
| let tx_hash = pool_transaction.as_ref().hash(); | ||
| self.drop_transaction(tx_hash); | ||
| }); | ||
| } |
There was a problem hiding this comment.
while this works, I want this to be
fn clear(&self) {
let pool = self.inner.write();
pool.clear(); // this clears both tx sets, calls clear on all their internals
}There was a problem hiding this comment.
Makes sense, and this should be more performant too
…c to clear transaction internals + be more performant
|
Moved to a |
This was referenced Apr 26, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
Fixes #7249
Solution
Added a new rpc method, and added the corresponding implementation in the mod.rs file for pool.