Skip to content

[Merged by Bors] - Merge Engines and Engine struct in one in the execution_layer crate#3284

Closed
divagant-martian wants to merge 1 commit intosigp:unstablefrom
divagant-martian:finish-fallback-removal-v2
Closed

[Merged by Bors] - Merge Engines and Engine struct in one in the execution_layer crate#3284
divagant-martian wants to merge 1 commit intosigp:unstablefrom
divagant-martian:finish-fallback-removal-v2

Conversation

@divagant-martian
Copy link
Contributor

@divagant-martian divagant-martian commented Jun 24, 2022

Issue Addressed

Part of #3118, continuation of #3257 and #3283

Proposed Changes

Additional Info

There is more cleanup to do that will come in subsequent PRs

@divagant-martian divagant-martian force-pushed the finish-fallback-removal-v2 branch 4 times, most recently from cbb855d to b52743c Compare July 1, 2022 04:35
@paulhauner paulhauner added the work-in-progress PR is a work-in-progress label Jul 4, 2022
@divagant-martian divagant-martian force-pushed the finish-fallback-removal-v2 branch from 048c7d6 to 85ea052 Compare July 6, 2022 17:18
@divagant-martian divagant-martian added ready-for-review The code is ready for review and removed work-in-progress PR is a work-in-progress labels Jul 6, 2022
@divagant-martian divagant-martian marked this pull request as ready for review July 6, 2022 17:23
@divagant-martian divagant-martian requested review from paulhauner and realbigsean and removed request for realbigsean July 6, 2022 17:23
@divagant-martian divagant-martian added the low-hanging-fruit Easy to resolve, get it before someone else does! label Jul 8, 2022
Copy link
Member

@paulhauner paulhauner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@paulhauner paulhauner added ready-for-merge This PR is ready to merge. and removed ready-for-review The code is ready for review labels Jul 10, 2022
@paulhauner
Copy link
Member

bors r+

@bors bors bot changed the title Merge Engines and Engine struct in one in the execution_layer crate [Merged by Bors] - Merge Engines and Engine struct in one in the execution_layer crate Jul 11, 2022
@bors bors bot closed this Jul 11, 2022
bors bot pushed a commit that referenced this pull request Jul 13, 2022
## Issue Addressed

Resolves #3176

## Proposed Changes

Continues from PRs by @divagant-martian to gradually remove EL redundancy (see #3284, #3257).

This PR achieves:

- Removes the `broadcast` and `first_success` methods. The functional impact is that every request to the EE will always be tried immediately, regardless of the cached `EngineState` (this resolves #3176). Previously we would check the engine state before issuing requests, this doesn't make sense in a single-EE world; there's only one EE so we might as well try it for every request.
- Runs the upcheck/watchdog routine once per slot rather than thrice. When we had multiple EEs frequent polling was useful to try and detect when the primary EE had come back online and we could switch to it. That's not as relevant now.
- Always creates logs in the `Engines::upcheck` function. Previously we would mute some logs since they could get really noisy when one EE was down but others were functioning fine. Now we only have one EE and are upcheck-ing it less, it makes sense to always produce logs.

This PR purposefully does not achieve:

- Updating all occurances of "engines" to "engine". I'm trying to keep the diff small and manageable. We can come back for this.

## Additional Info

NA
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

low-hanging-fruit Easy to resolve, get it before someone else does! ready-for-merge This PR is ready to merge.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants