adds chained_merkle_root to shredder arguments #34952
Conversation
behzadnouri
force-pushed
the
chained-merkle-shreds-lite
branch
2 times, most recently
from
05743a3 to
d3d9cc1
Compare
Codecov ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## master #34952 +/- ##
=======================================
Coverage 81.6% 81.6%
=======================================
Files 830 830
Lines 224746 224797 +51
=======================================
+ Hits 183512 183560 +48
- Misses 41234 41237 +3 |
Working towards chaining Merkle root of erasure batches, the commit adds chained_merkle_root to shredder arguments.
behzadnouri
force-pushed
the
chained-merkle-shreds-lite
branch
from
d3d9cc1 to
f16bf3e
Compare
behzadnouri
requested review from
carllin,
steviez,
AshwinSekar and
bw-solana
| @@ -85,6 +85,7 @@ impl StandardBroadcastRun { | |||
| keypair, | |||
| &[], // entries | |||
| true, // is_last_in_slot, | |||
| None, // chained_merkle_root | |||
There was a problem hiding this comment.
Maintaining last Merkle root here and elsewhere in turbine/src/broadcast_stage will be done separately in the follow up commits.
| @@ -7434,7 +7444,7 @@ pub mod tests { | |||
| #[test] | |||
| fn test_insert_multiple_is_last() { | |||
| solana_logger::setup(); | |||
| let (shreds, _) = make_slot_entries(0, 0, 20, /*merkle_variant:*/ true); | |||
| let (shreds, _) = make_slot_entries(0, 0, 19, /*merkle_variant:*/ true); | |||
There was a problem hiding this comment.
any reason to change this from 20 -> 19?
There was a problem hiding this comment.
The test tries to insert a shred where index > already recorded last_index.
Because of the embedded chained Merkle root, shreds have smaller capacity, so with 20 this line generates the same number of shreds as L7460.
So we won't see any shred with index > last_index when inserting the second set of shreds.
So I reduced this to 19 so that the added assertion in L7461 still holds as before.
|
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. |
Working towards chaining Merkle root of erasure batches, the commit adds chained_merkle_root to shredder arguments. (cherry picked from commit 79bbe43)
…4952) (#35150) adds chained_merkle_root to shredder arguments (#34952) Working towards chaining Merkle root of erasure batches, the commit adds chained_merkle_root to shredder arguments. (cherry picked from commit 79bbe43) Co-authored-by: behzad nouri <[email protected]>
Problem
Working towards chaining Merkle root of erasure batches.
Summary of Changes
Added
chained_merkle_rootto shredder arguments