Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fall back to non-fcu fork choice on epoch boundaries #5195

Merged
merged 5 commits into from
Jul 17, 2023
Merged

fall back to non-fcu fork choice on epoch boundaries #5195

merged 5 commits into from
Jul 17, 2023

Conversation

tersec
Copy link
Contributor

@tersec tersec commented Jul 17, 2023

No description provided.

beacon_chain/consensus_object_pools/consensus_manager.nim Outdated Show resolved Hide resolved
let
nextWallSlot = wallSlot + 1
(validatorIndex, nextProposer) = self.checkNextProposer(wallSlot).valueOr:
return
return false
Copy link
Contributor

Choose a reason for hiding this comment

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

? self.checkNextProposer(wallSlot), if going with Opt[void]

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, will update these to be consistent

Copy link
Contributor

Choose a reason for hiding this comment

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

also, Future[Opt[void]], accidentally forgot the Future wrapper on first attempt

Copy link
Contributor Author

Choose a reason for hiding this comment

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

88ea3e2

I did try ? self.checkNextProposer and it didn't seem to work, but can investigate later. The valueOr approach still works.

@tersec tersec enabled auto-merge (squash) July 17, 2023 18:31
@github-actions
Copy link

Unit Test Results

         9 files    1 074 suites   43m 7s ⏱️
  3 712 tests   3 433 ✔️ 279 💤 0
15 832 runs  15 527 ✔️ 305 💤 0

Results for commit 88ea3e2.

@tersec tersec merged commit 3a818ec into unstable Jul 17, 2023
@tersec tersec deleted the sJ4 branch July 17, 2023 20:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants