Skip to content

cleanup unchained continuation #8079

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.

Sign up for GitHub

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

Merged
steviez merged 13 commits into from
Sep 23, 2025
Merged

cleanup unchained continuation #8079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9dc1910
remove option from setup_erasure_shreds_with_index_and_chained_merkle…
puhtaytow Sep 17, 2025
f914653
switch to chained merkle root in test_invalid_forks_persisted_on_restart
puhtaytow Sep 17, 2025
accf757
remove unchained variants from test_shred_variant_compat_merkle_data
puhtaytow Sep 17, 2025
46b74b1
remove unchained variant from test_shred_variant_compat_merkle_code
puhtaytow Sep 17, 2025
4bf832e
remove unchained variant from test_is_shred_duplicate
puhtaytow Sep 17, 2025
7c333c5
remove last part of the test_check_last_fec_set aka slot is full, but…
puhtaytow Sep 18, 2025
4042636
remove option from chained_merkle_root param in setup_erasure_shreds_…
puhtaytow Sep 18, 2025
9daba0e
remove option from chained_merkle_root param in ledger/benches/make_s…
puhtaytow Sep 18, 2025
5817383
remove option from chained_merkle_root param in shredder/entries_to_m…
puhtaytow Sep 18, 2025
f96e47d
remove chained switch in sigverify_shreds/make_shreds
puhtaytow Sep 18, 2025
2e0732e
remove option from chained_merkle_root in shredder/make_merkle_shreds…
puhtaytow Sep 18, 2025
69626b7
remove option from chained_merkle_root in shredder/make_shreds_from_d…
puhtaytow Sep 18, 2025
e3d4e4f
remove chained param from ledger/shred/make_merkle_shreds_for_tests
puhtaytow Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions core/benches/shredder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ fn bench_shredder_ticks(bencher: &mut Bencher) {
let num_ticks = max_ticks_per_n_shreds(1, Some(SHRED_SIZE_TYPICAL)) * num_shreds as u64;
let entries = create_ticks(num_ticks, 0, Hash::default());
let reed_solomon_cache = ReedSolomonCache::default();
let chained_merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let chained_merkle_root = Hash::new_from_array(rand::thread_rng().gen());
bencher.iter(|| {
let shredder = Shredder::new(1, 0, 0, 0).unwrap();
shredder.entries_to_merkle_shreds_for_tests(
Expand Down Expand Up @@ -71,7 +71,7 @@ fn bench_shredder_large_entries(bencher: &mut Bencher) {
Some(shred_size),
);
let entries = make_large_unchained_entries(txs_per_entry, num_entries);
let chained_merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let chained_merkle_root = Hash::new_from_array(rand::thread_rng().gen());
let reed_solomon_cache = ReedSolomonCache::default();
// 1Mb
bencher.iter(|| {
Expand All @@ -98,7 +98,7 @@ fn bench_deshredder(bencher: &mut Bencher) {
let num_ticks = max_ticks_per_n_shreds(1, Some(shred_size)) * num_shreds as u64;
let entries = create_ticks(num_ticks, 0, Hash::default());
let shredder = Shredder::new(1, 0, 0, 0).unwrap();
let chained_merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let chained_merkle_root = Hash::new_from_array(rand::thread_rng().gen());
let (data_shreds, _) = shredder.entries_to_merkle_shreds_for_tests(
&kp,
&entries,
Expand All @@ -120,7 +120,7 @@ fn bench_deshredder(bencher: &mut Bencher) {
fn bench_deserialize_hdr(bencher: &mut Bencher) {
let keypair = Keypair::new();
let shredder = Shredder::new(2, 1, 0, 0).unwrap();
let merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let merkle_root = Hash::new_from_array(rand::thread_rng().gen());
let mut stats = ProcessShredsStats::default();
let reed_solomon_cache = ReedSolomonCache::default();
let mut shreds = shredder
Expand Down Expand Up @@ -155,7 +155,7 @@ fn bench_shredder_coding(bencher: &mut Bencher) {
let entries = make_entries();
let shredder = Shredder::new(1, 0, 0, 0).unwrap();
let reed_solomon_cache = ReedSolomonCache::default();
let merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let merkle_root = Hash::new_from_array(rand::thread_rng().gen());
bencher.iter(|| {
let result: Vec<_> = shredder
.make_merkle_shreds_from_entries(
Expand All @@ -178,7 +178,7 @@ fn bench_shredder_decoding(bencher: &mut Bencher) {
let entries = make_entries();
let shredder = Shredder::new(1, 0, 0, 0).unwrap();
let reed_solomon_cache = ReedSolomonCache::default();
let merkle_root = Some(Hash::new_from_array(rand::thread_rng().gen()));
let merkle_root = Hash::new_from_array(rand::thread_rng().gen());
let (_data_shreds, mut coding_shreds): (Vec<_>, Vec<_>) = shredder
.make_merkle_shreds_from_entries(
&Keypair::new(),
Expand Down
2 changes: 1 addition & 1 deletion core/src/repair/repair_weighted_traversal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ pub mod test {
&keypair,
&[],
true,
Some(Hash::default()),
Hash::default(),
last_shred as u32,
last_shred as u32,
&reed_solomon_cache,
Expand Down
4 changes: 2 additions & 2 deletions core/src/repair/serve_repair.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1838,7 +1838,7 @@ mod tests {
&keypair,
&[],
true,
Some(Hash::default()),
Hash::default(),
index as u32,
index as u32,
&reed_solomon_cache,
Expand Down Expand Up @@ -2277,7 +2277,7 @@ mod tests {
&keypair,
&[],
true,
Some(Hash::default()),
Hash::default(),
0,
0,
&reed_solomon_cache,
Expand Down
2 changes: 1 addition & 1 deletion core/src/replay_stage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5106,7 +5106,7 @@ pub(crate) mod tests {
&keypair,
&gibberish,
true,
Some(Hash::default()),
Hash::default(),
0,
0,
&reed_solomon_cache,
Expand Down
2 changes: 1 addition & 1 deletion core/src/window_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ mod test {
entries,
true, // is_last_in_slot
// chained_merkle_root
Some(Hash::new_from_array(rand::thread_rng().gen())),
Hash::new_from_array(rand::thread_rng().gen()),
0, // next_shred_index
0, // next_code_index
&ReedSolomonCache::default(),
Expand Down
2 changes: 1 addition & 1 deletion gossip/src/duplicate_shred.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ pub(crate) mod tests {
&entries,
is_last_in_slot,
// chained_merkle_root
Some(Hash::new_from_array(rng.gen())),
Hash::new_from_array(rng.gen()),
next_shred_index,
next_code_index, // next_code_index
&ReedSolomonCache::default(),
Expand Down
8 changes: 4 additions & 4 deletions ledger-tool/src/bigtable.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,10 +393,10 @@ async fn shreds(
.make_merkle_shreds_from_entries(
&keypair,
&entries,
true, // last_in_slot
None, // chained_merkle_root
0, // next_shred_index
0, // next_code_index
true, // last_in_slot
Hash::default(), // chained_merkle_root
Comment thread
steviez marked this conversation as resolved.
0, // next_shred_index
0, // next_code_index
&ReedSolomonCache::default(),
&mut ProcessShredsStats::default(),
)
Expand Down
6 changes: 3 additions & 3 deletions ledger/benches/make_shreds_from_entries.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ fn make_shreds_from_entries<R: Rng>(
keypair: &Keypair,
entries: &[Entry],
is_last_in_slot: bool,
chained_merkle_root: Option<Hash>,
chained_merkle_root: Hash,
reed_solomon_cache: &ReedSolomonCache,
stats: &mut ProcessShredsStats,
) -> (Vec<Shred>, Vec<Shred>) {
Expand Down Expand Up @@ -89,7 +89,7 @@ fn run_make_shreds_from_entries(
let keypair = Keypair::new();
let data_size = num_packets * PACKET_DATA_SIZE;
let entries = make_dummy_entries(&mut rng, data_size);
let chained_merkle_root = Some(make_dummy_hash(&mut rng));
let chained_merkle_root = make_dummy_hash(&mut rng);
let reed_solomon_cache = ReedSolomonCache::default();
let mut stats = ProcessShredsStats::default();
// Initialize the thread-pool and warm the Reed-Solomon cache.
Expand Down Expand Up @@ -143,7 +143,7 @@ fn run_recover_shreds(
let keypair = Keypair::new();
let data_size = num_packets * PACKET_DATA_SIZE;
let entries = make_dummy_entries(&mut rng, data_size);
let chained_merkle_root = Some(make_dummy_hash(&mut rng));
let chained_merkle_root = make_dummy_hash(&mut rng);
let reed_solomon_cache = ReedSolomonCache::default();
let mut stats = ProcessShredsStats::default();
let (data, code) = make_shreds_from_entries(
Expand Down
Loading
Loading