From b369831057a38e13913e477f76d687818ffca01a Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 22 Feb 2024 20:27:05 +0000
Subject: [PATCH] v1.18: uses Merkle shreds in broadcast duplicates (backport
 of #35115) (#35290)

uses Merkle shreds in broadcast duplicates (#35115)

The  commit migrates away from legacy shreds in duplicate shreds tests.

(cherry picked from commit 7a95e4fa90208b281018dab7f7e87f0aeb203c74)

Co-authored-by: behzad nouri <behzadnouri@gmail.com>
---
 local-cluster/tests/local_cluster.rs                   | 10 +++++-----
 .../src/broadcast_stage/broadcast_duplicates_run.rs    |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index 55c032ba881735..c958820e7725a1 100644
--- 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
index 8bee47068ac499..3190c039a116d0 100644
--- 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(),
                 );