From 47ac82a725e629c883d58b5c8787580f0b65c14b Mon Sep 17 00:00:00 2001
From: behzad nouri <behzadnouri@gmail.com>
Date: Fri, 27 Jan 2023 21:02:51 +0000
Subject: [PATCH] feature gates merkle shreds on all clusters (#29957)

(cherry picked from commit 7f173ce7c79ceb87bc3055d1664d5ba4955e39b9)
---
 core/src/shred_fetch_stage.rs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/core/src/shred_fetch_stage.rs b/core/src/shred_fetch_stage.rs
index ee0e4b6e28042f..7da542275d3576 100644
--- a/core/src/shred_fetch_stage.rs
+++ b/core/src/shred_fetch_stage.rs
@@ -14,7 +14,6 @@ use {
     solana_sdk::{
         clock::{Slot, DEFAULT_MS_PER_SLOT},
         feature_set,
-        genesis_config::ClusterType,
     },
     solana_streamer::streamer::{self, PacketBatchReceiver, StreamerReceiveStats},
     std::{
@@ -265,17 +264,15 @@ fn should_discard_packet(
 
 #[must_use]
 fn should_drop_merkle_shreds(shred_slot: Slot, root_bank: &Bank) -> bool {
-    root_bank.cluster_type() == ClusterType::Testnet
-        && check_feature_activation(
-            &feature_set::drop_merkle_shreds::id(),
-            shred_slot,
-            root_bank,
-        )
-        && !check_feature_activation(
-            &feature_set::keep_merkle_shreds::id(),
-            shred_slot,
-            root_bank,
-        )
+    check_feature_activation(
+        &feature_set::drop_merkle_shreds::id(),
+        shred_slot,
+        root_bank,
+    ) && !check_feature_activation(
+        &feature_set::keep_merkle_shreds::id(),
+        shred_slot,
+        root_bank,
+    )
 }
 
 #[cfg(test)]