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

removes outdated check for merkle shreds #33088

Merged
merged 1 commit into from
Aug 31, 2023

Conversation

behzadnouri
Copy link
Contributor

Problem

No longer need to check and filter out Merkle shreds.

Summary of Changes

Removed outdated check for feature activation.

@behzadnouri behzadnouri merged commit 1431275 into solana-labs:master Aug 31, 2023
25 checks passed
@behzadnouri behzadnouri deleted the rm-merkle-feature branch August 31, 2023 20:01
@steviez steviez added the v1.16 PRs that should be backported to v1.16 label Sep 4, 2023
mergify bot pushed a commit that referenced this pull request Sep 4, 2023
(cherry picked from commit 1431275)

# Conflicts:
#	core/src/cluster_nodes.rs
#	core/src/shred_fetch_stage.rs
steviez added a commit that referenced this pull request Sep 5, 2023
…33136)

* removes outdated check for merkle shreds (#33088)
* Add back deleted features to keep feature set id unchaged
* Use root_bank.slot() to update last_root to avoid unused variable

(cherry picked from commit 1431275)

# Conflicts:
#	core/src/cluster_nodes.rs
#	core/src/shred_fetch_stage.rs

---------

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
Co-authored-by: Steven Czabaniuk <steven@solana.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.16 PRs that should be backported to v1.16
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants