v1.18: patches bug in chained Merkle root update (backport of #1689) #1692
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
![mergify[bot]](https://avatars.githubusercontent.com/in/10562?s=60&v=4){kind=small}
Option::ok_or_else always maps None to Err which is not what was intended in this code. (cherry picked from commit e804bcc)
|
This change has no functional impact because chained Merkle shreds are behind a feature which is not activated yet. So |
behzadnouri
added
the
automerge
AshwinSekar
approved these changes
Jun 11, 2024
There was a problem hiding this comment.
For context, here is a report of such an error log in 1.18.16 https://discord.com/channels/428295358100013066/560174212967432193/1249982148870537297
CriesofCarrots
approved these changes
Jun 11, 2024
anwayde
pushed a commit
to firedancer-io/agave
that referenced
this pull request
Jul 23, 2024
…z#1689) (anza-xyz#1692) patches bug in chained Merkle root update (anza-xyz#1689) Option::ok_or_else always maps None to Err which is not what was intended in this code. (cherry picked from commit e804bcc) Co-authored-by: behzad nouri <behzadnouri@gmail.com>
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.
Problem
Option::ok_or_elsealways mapsNonetoErrwhich is not what was intended in this code:https://github.com/anza-xyz/agave/blob/362c60505/turbine/src/broadcast_stage/standard_broadcast_run.rs#L248-L254
Summary of Changes
removed
ok_or_else.This is an automatic backport of pull request #1689 done by [Mergify](https://mergify.com).