v1.18: uses Merkle shreds in broadcast duplicates (backport of solana…

…-labs#35115) (solana-labs#35290) uses Merkle shreds in broadcast duplicates (solana-labs#35115) The commit migrates away from legacy shreds in duplicate shreds tests. (cherry picked from commit 7a95e4f) Co-authored-by: behzad nouri <behzadnouri@gmail.com>
anza-xyz · Feb 22, 2024 · b369831 · b369831
1 parent 97f224a
commit b369831
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
@@ -5601,11 +5601,11 @@ fn test_invalid_forks_persisted_on_restart() {
             .entries_to_shreds(
                 &majority_keypair,
                 &entries,
-                true,  // is_full_slot
-                None,  // chained_merkle_root
-                0,     // next_shred_index,
-                0,     // next_code_index
-                false, // merkle_variant
+                true, // is_full_slot
+                None, // chained_merkle_root
+                0,    // next_shred_index,
+                0,    // next_code_index
+                true, // merkle_variant
                 &ReedSolomonCache::default(),
                 &mut ProcessShredsStats::default(),
             )

diff --git a/turbine/src/broadcast_stage/broadcast_duplicates_run.rs b/turbine/src/broadcast_stage/broadcast_duplicates_run.rs
@@ -176,7 +176,7 @@ impl BroadcastRun for BroadcastDuplicatesRun {
             None, // chained_merkle_root
             self.next_shred_index,
             self.next_code_index,
-            false, // merkle_variant
+            true, // merkle_variant
             &self.reed_solomon_cache,
             &mut ProcessShredsStats::default(),
         );
@@ -194,7 +194,7 @@ impl BroadcastRun for BroadcastDuplicatesRun {
                     None, // chained_merkle_root
                     self.next_shred_index,
                     self.next_code_index,
-                    false, // merkle_variant
+                    true, // merkle_variant
                     &self.reed_solomon_cache,
                     &mut ProcessShredsStats::default(),
                 );
@@ -208,7 +208,7 @@ impl BroadcastRun for BroadcastDuplicatesRun {
                     None, // chained_merkle_root
                     self.next_shred_index,
                     self.next_code_index,
-                    false, // merkle_variant
+                    true, // merkle_variant
                     &self.reed_solomon_cache,
                     &mut ProcessShredsStats::default(),
                 );