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

patches bug in chained Merkle root update #1689

Merged
merged 1 commit into from
Jun 11, 2024

Conversation

behzadnouri
Copy link

Problem

Option::ok_or_else always maps None to Err which 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.

@behzadnouri behzadnouri requested a review from AshwinSekar June 11, 2024 13:34
AshwinSekar
AshwinSekar previously approved these changes Jun 11, 2024
@behzadnouri behzadnouri merged commit e804bcc into anza-xyz:master Jun 11, 2024
40 checks passed
@behzadnouri behzadnouri deleted the patch-chained-merkle-root branch June 11, 2024 17:06
Copy link

mergify bot commented Jun 11, 2024

Backports to the beta branch are to be avoided unless absolutely necessary for fixing bugs, security issues, and perf regressions. Changes intended for backport should be structured such that a minimum effective diff can be committed separately from any refactoring, plumbing, cleanup, etc that are not strictly necessary to achieve the goal. Any of the latter should go only into master and ride the normal stabilization schedule. Exceptions include CI/metrics changes, CLI improvements and documentation updates on a case by case basis.

mergify bot pushed a commit that referenced this pull request Jun 11, 2024
Option::ok_or_else always maps None to Err which is not what was intended in
this code.

(cherry picked from commit e804bcc)
mergify bot added a commit that referenced this pull request Jun 11, 2024
…1692)

patches bug in chained Merkle root update (#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 <[email protected]>
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 <[email protected]>
samkim-crypto pushed a commit to samkim-crypto/agave that referenced this pull request Jul 31, 2024
Option::ok_or_else always maps None to Err which is not what was intended in
this code.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants