This repository was archived by the owner on Nov 6, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.7k
[ethcore]: apply filter when PendingSet::AlwaysQueue
in ready_transactions_filtered
#11227
Merged
+975
−873
Conversation
This file contains hidden or 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
In `ready_transactions_filtered` the filter were never applied when the options PendingSet::AlwaysQueue` was configured which this fixes It also adds a two tests for it
niklasad1
commented
Oct 31, 2019
use std::fmt; | ||
use std::marker::PhantomData; | ||
|
||
use ethereum_types::{Address, U256}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
most changes are whitespaces
niklasad1
commented
Oct 31, 2019
dvdplm
approved these changes
Nov 6, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
minor nits, looks good
Co-Authored-By: David <[email protected]>
Co-Authored-By: David <[email protected]>
Co-Authored-By: David <[email protected]>
Co-Authored-By: David <[email protected]>
Co-Authored-By: David <[email protected]>
ordian
approved these changes
Nov 25, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
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.
Fixes that
the filter
is applied for when parity is executed with--relay-set= cheap
i.e, fetch transactions from the transaction queueThe important changes are:
self.transaction_queue.pending(...
same forfrom_pending
filter_options
to avoid doing several timesethcore/miner/miner
filtering logic
so I didn't bother.The semantics will be different between
from_queue
andfrom_pending
,from_queue
: will receive a Vec with at mostmax_len
and then the filter is applied, to avoid allocating a huge vector if there are many transactions in the queuefrom_pending
: will iterate through the pending transactions and apply filter until max_len transactions are collected or all have been visited.