diff --git a/gossip/src/crds_gossip_pull.rs b/gossip/src/crds_gossip_pull.rs index c3044dbba8cc43..191406dd6720d8 100644 --- a/gossip/src/crds_gossip_pull.rs +++ b/gossip/src/crds_gossip_pull.rs @@ -18,7 +18,7 @@ use { crds::{Crds, GossipRoute, VersionedCrdsValue}, crds_gossip, crds_gossip_error::CrdsGossipError, - crds_value::{CrdsData, CrdsValue}, + crds_value::CrdsValue, legacy_contact_info::LegacyContactInfo as ContactInfo, ping_pong::PingCache, }, @@ -488,11 +488,6 @@ impl CrdsGossipPull { let out: Vec<_> = crds .filter_bitmask(filter.mask, filter.mask_bits) .filter(pred) - .filter(|entry| { - // Exclude the new ContactInfo from the pull responses - // until the cluster has upgraded. - !matches!(&entry.value.data, CrdsData::ContactInfo(_)) - }) .map(|entry| entry.value.clone()) .take(output_size_limit.load(Ordering::Relaxed).max(0) as usize) .collect(); diff --git a/gossip/src/crds_gossip_push.rs b/gossip/src/crds_gossip_push.rs index 345c9eaf17287f..72ffc30a4863ca 100644 --- a/gossip/src/crds_gossip_push.rs +++ b/gossip/src/crds_gossip_push.rs @@ -16,7 +16,7 @@ use { cluster_info::{Ping, CRDS_UNIQUE_PUBKEY_CAPACITY}, crds::{Crds, CrdsError, Cursor, GossipRoute}, crds_gossip, - crds_value::{CrdsData, CrdsValue}, + crds_value::CrdsValue, ping_pong::PingCache, push_active_set::PushActiveSet, received_cache::ReceivedCache, @@ -191,11 +191,6 @@ impl CrdsGossipPush { let crds = crds.read().unwrap(); let entries = crds .get_entries(crds_cursor.deref_mut()) - .filter(|entry| { - // Exclude the new ContactInfo from outgoing push messages - // until the cluster has upgraded. - !matches!(&entry.value.data, CrdsData::ContactInfo(_)) - }) .map(|entry| &entry.value) .filter(|value| wallclock_window.contains(&value.wallclock())); for value in entries {