From 1b600a7f376d32b8724ed1f4cee3544fd0824c74 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Wed, 12 Feb 2020 12:05:56 -0700 Subject: [PATCH] Update cluster_info.rs --- core/src/cluster_info.rs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index c9a5014f01..8a965cb2fc 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -519,15 +519,7 @@ impl ClusterInfo { let me = self.my_data(); ClusterInfo::tvu_peers(self) .into_iter() - .filter(|x| x.id != me.id) - .filter(|x| x.shred_version == me.shred_version) - .filter(|x| ContactInfo::is_valid_address(&x.gossip)) .filter(|x| { -<<<<<<< HEAD - self.get_epoch_state_for_node(&x.id, None) - .map(|(epoch_slots, _)| epoch_slots.lowest <= slot) - .unwrap_or_else(|| /* fallback to legacy behavior */ true) -======= x.id != me.id && x.shred_version == me.shred_version && ContactInfo::is_valid_address(&x.serve_repair) @@ -536,7 +528,6 @@ impl ClusterInfo { .map(|(epoch_slots, _)| epoch_slots.lowest <= slot) .unwrap_or_else(|| /* fallback to legacy behavior */ true) } ->>>>>>> d0a468699... Avoid assigning the serve repair port to the storage port }) .collect() }