filters out merkle shreds until feature activation (#30769)
In order to maintain backward compatibility, the commit reworks merkle shreds feature gate to off by default until the feature activation.
This commit is contained in:
parent
4b595ebaaf
commit
4de59881b7
|
@ -263,11 +263,11 @@ fn should_discard_packet<const K: usize>(
|
||||||
#[must_use]
|
#[must_use]
|
||||||
fn should_drop_merkle_shreds(shred_slot: Slot, root_bank: &Bank) -> bool {
|
fn should_drop_merkle_shreds(shred_slot: Slot, root_bank: &Bank) -> bool {
|
||||||
check_feature_activation(
|
check_feature_activation(
|
||||||
&feature_set::drop_merkle_shreds::id(),
|
&feature_set::keep_merkle_shreds::id(),
|
||||||
shred_slot,
|
shred_slot,
|
||||||
root_bank,
|
root_bank,
|
||||||
) && !check_feature_activation(
|
) && !check_feature_activation(
|
||||||
&feature_set::keep_merkle_shreds::id(),
|
&feature_set::drop_merkle_shreds::id(),
|
||||||
shred_slot,
|
shred_slot,
|
||||||
root_bank,
|
root_bank,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue