feat: introduce iterator for default_ethereum_payload function #11978
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, is this what you had in mind? |
mattsse
requested changes
Oct 24, 2024
crates/ethereum/payload/src/lib.rs
Outdated
| @@ -124,16 +147,18 @@ where | |||
| /// and configuration, this function creates a transaction payload. Returns | |||
| /// a result indicating success with the payload or an error in case of failure. | |||
| #[inline] | |||
| pub fn default_ethereum_payload<EvmConfig, Pool, Client>( | |||
| pub fn default_ethereum_payload<EvmConfig, Pool, Client, IteratorClosure>( | |||
There was a problem hiding this comment.
let's just name this F
Suggested change
| pub fn default_ethereum_payload<EvmConfig, Pool, Client, IteratorClosure>( | |
| pub fn default_ethereum_payload<EvmConfig, Pool, Client, F>( |
crates/ethereum/payload/src/lib.rs
Outdated
| evm_config: EvmConfig, | ||
| args: BuildArguments<Pool, Client, EthPayloadBuilderAttributes, EthBuiltPayload>, | ||
| initialized_cfg: CfgEnvWithHandlerCfg, | ||
| initialized_block_env: BlockEnv, | ||
| build_best_txs_closure: IteratorClosure, |
There was a problem hiding this comment.
Suggested change
| build_best_txs_closure: IteratorClosure, | |
| best_txs: IteratorClosure, |
crates/ethereum/payload/src/lib.rs
Outdated
Comment on lines
49
to
50
| type BestTransactionsIter<Transaction> = | ||
| Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<Transaction>>>>; |
There was a problem hiding this comment.
let's make this generic over pool
type BestTransactionsFor<Pool> = Box<dyn BestTransactions<Item = Arc<ValidPoolTransaction<<Pool as TransactionPool>::Transaction>>>>
crates/ethereum/payload/src/lib.rs
Outdated
| default_ethereum_payload(self.evm_config.clone(), args, cfg_env, block_env) | ||
| let pool = args.pool.clone(); | ||
|
|
||
| let iterator_closure = |attributes| pool.best_transactions_with_attributes(attributes); |
There was a problem hiding this comment.
we don't need a tmp var for this and can make this the argument directly
crates/ethereum/payload/src/lib.rs
Outdated
| args, | ||
| cfg_env, | ||
| block_env, | ||
| iterator_closure, |
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.
Closes #11889