[Merged by Bors] - Simplify error handling after engines fallback removal#3283
Closed
divagant-martian wants to merge 7 commits intosigp:unstablefrom
Closed
[Merged by Bors] - Simplify error handling after engines fallback removal#3283divagant-martian wants to merge 7 commits intosigp:unstablefrom
divagant-martian wants to merge 7 commits intosigp:unstablefrom
Conversation
divagant-martian
force-pushed
the
finish-fallback-removal
branch
3 times, most recently
from
6c482bc to
da02edc
Compare
finish rebase update docs update only docs of changed stuff
…lippy fix uncaught fmt failure
divagant-martian
force-pushed
the
finish-fallback-removal
branch
from
373c77e to
759c6ca
Compare
Contributor
Author
|
test failure is fixed by #3303 |
divagant-martian
requested review from
paulhauner and
realbigsean
and removed request for
paulhauner
paulhauner
approved these changes
Jul 4, 2022
Member
paulhauner
left a comment
paulhauner
left a comment
There was a problem hiding this comment.
Nice and succinct! I'm happy with this, I just had one suggestion about error logging.
| Ok(result) => Ok(result), | ||
| Err(mut first_errors) => { | ||
| // Try to recover some nodes. | ||
| Err(_e) => { |
Member
There was a problem hiding this comment.
Perhaps we could log this error to assist with debugging?
Contributor
Author
There was a problem hiding this comment.
let me know if you prefer a different msg 7150a89
paulhauner
added
waiting-on-author
divagant-martian
added
ready-for-review
paulhauner
approved these changes
Jul 4, 2022
Member
paulhauner
left a comment
paulhauner
left a comment
There was a problem hiding this comment.
Looks good! Merge at will
Member
|
bors r+ |
bors bot
pushed a commit
that referenced
this pull request
Jul 4, 2022
## Issue Addressed Part of #3118, continuation of #3257 ## Proposed Changes - the [ `first_success_without_retry` ](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/engines.rs#L348-L351) function returns a single error. - the [`first_success`](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/engines.rs#L324) function returns a single error. - [ `EngineErrors` ](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/lib.rs#L69) carries a single error. - [`EngineError`](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/engines.rs#L173-L177) now does not need to carry an Id - [`process_multiple_payload_statuses`](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/payload_status.rs#L46-L50) now doesn't need to receive an iterator of statuses and weight in different errors ## Additional Info This is built on top of #3294
bors
bot
changed the title
bors bot
pushed a commit
that referenced
this pull request
Jul 11, 2022
…#3284) ## Issue Addressed Part of #3118, continuation of #3257 and #3283 ## Proposed Changes - Merge the [`Engines`](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/engines.rs#L161-L165) struct and [`Engine` ](https://github.com/sigp/lighthouse/blob/9c429d0764ed91cf56efb8a47a35a556b54a86a4/beacon_node/execution_layer/src/engines.rs#L62-L67) - Remove unnecessary generics ## Additional Info There is more cleanup to do that will come in subsequent PRs
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Issue Addressed
Part of #3118, continuation of #3257
Proposed Changes
first_success_without_retryfunction returns a single error.first_successfunction returns a single error.EngineErrorscarries a single error.EngineErrornow does not need to carry an Idprocess_multiple_payload_statusesnow doesn't need to receive an iterator of statuses and weight in different errorsAdditional Info
This is built on top of #3294