Skip to content

turbine, bench: move remaining benches to merkle variant#6747

Merged
0xbrw merged 7 commits intoanza-xyz:masterfrom
puhtaytow:feat/merkle-bench-2
Jun 30, 2025
Merged

turbine, bench: move remaining benches to merkle variant#6747
0xbrw merged 7 commits intoanza-xyz:masterfrom
puhtaytow:feat/merkle-bench-2

Conversation

@puhtaytow
Copy link
Copy Markdown

@puhtaytow puhtaytow commented Jun 26, 2025

Problem

Legacy shreds need to go #5982

Summary of Changes

Moved remaining bench to merkle variant. Removed NUM_SIMULATED_SHREDS entirely.

@mergify mergify Bot requested a review from a team June 26, 2025 07:26
Comment thread turbine/benches/cluster_nodes.rs Outdated
let shredder = Shredder::new(slot, parent_slot, 0, 0).unwrap();

let shreds = shredder
.make_merkle_shreds_from_entries(
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

The way you are calling this it will always make exactly 64 shreds. you should either make sure the number of produced shreds is what num_simulated_shreds calls for, or remove the num_simulated_shreds completely (as it is const anyway and not critical to the purpose of the bench)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

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

Removed it. Thank you 🙏

@puhtaytow puhtaytow requested a review from alexpyattaev June 26, 2025 07:54
@alexpyattaev alexpyattaev added CI Pull Request is ready to enter CI labels Jun 26, 2025
@anza-team anza-team removed the CI Pull Request is ready to enter CI label Jun 26, 2025
@alexpyattaev
Copy link
Copy Markdown

You need to run ./scripts/cargo_clippy.sh and address all its complaints before pushing. Since it is a bench you can just slap allow on this.

@puhtaytow
Copy link
Copy Markdown
Author

You need to run ./scripts/cargo_clippy.sh and address all its complaints before pushing. Since it is a bench you can just slap allow on this.

Fixed. Thank you 🙏

@alexpyattaev alexpyattaev added the CI Pull Request is ready to enter CI label Jun 27, 2025
@anza-team anza-team removed the CI Pull Request is ready to enter CI label Jun 27, 2025
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 83.3%. Comparing base (e72266c) to head (fb42a3c).
Report is 9 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff           @@
##           master    #6747   +/-   ##
=======================================
  Coverage    83.3%    83.3%           
=======================================
  Files         852      852           
  Lines      377993   377993           
=======================================
+ Hits       315195   315198    +3     
+ Misses      62798    62795    -3     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Copy link
Copy Markdown

@alexpyattaev alexpyattaev left a comment

Choose a reason for hiding this comment

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

Thank you, LGTM!

@puhtaytow
Copy link
Copy Markdown
Author

Thank you, LGTM!

Thank you :)

@0xbrw
Copy link
Copy Markdown

0xbrw commented Jun 30, 2025

@alexpyattaev is this safe to squash and merge?

@alexpyattaev
Copy link
Copy Markdown

@alexpyattaev is this safe to squash and merge?

yes, this is good to go

@0xbrw 0xbrw merged commit 0f647dd into anza-xyz:master Jun 30, 2025
30 checks passed
@puhtaytow puhtaytow deleted the feat/merkle-bench-2 branch July 1, 2025 05:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants