fix(engine): always push back hooks, add tests #4924
Merged
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.
Problem
We didn't push hook back to the collection in two cases:
reth/crates/consensus/beacon/src/engine/hooks/controller.rs
Lines 106 to 110 in 760a515
hook.poll
returns an error, and we short-circuit with?
:reth/crates/consensus/beacon/src/engine/hooks/controller.rs
Line 112 in 760a515
Solution
This PR introduces a helper
poll_next_hook_inner
method which guarantees that after trying to poll the hook we will either set the read-write hook as running, or push the hook back into collection.Also, I covered the functionality of both
poll_running_hook_with_db_write
andpoll_next_hook
with tests of various scenarios.