rolls back merkle shreds on testnet (backport #29340) (#29344)

rolls back merkle shreds on testnet (#29340) #29339 adds hash domain to merkle shreds. In order to merge that change, need to temporarily disable merkle shreds on testnet. (cherry picked from commit 5582924) Co-authored-by: behzad nouri <[email protected]>
solana-labs · Dec 20, 2022 · 6198c1b · 6198c1b
1 parent e21546c
commit 6198c1b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/broadcast_stage/standard_broadcast_run.rs b/core/src/broadcast_stage/standard_broadcast_run.rs
@@ -473,8 +473,8 @@ impl BroadcastRun for StandardBroadcastRun {
     }
 }
 
-fn should_use_merkle_variant(slot: Slot, cluster_type: ClusterType, shred_version: u16) -> bool {
-    cluster_type == ClusterType::Testnet && shred_version == 6995 && (slot % 19 < 4)
+fn should_use_merkle_variant(_slot: Slot, _cluster_type: ClusterType, _shred_version: u16) -> bool {
+    false
 }
 
 #[cfg(test)]