gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update cluster_info.rs

Browse Source
This commit is contained in:
Michael Vines
2020-02-12 12:05:56 -07:00
parent 798b457b27
commit 1b600a7f37
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/cluster_info.rs
View File

@ -519,15 +519,7 @@ impl ClusterInfo {
let me = self.my_data(); let me = self.my_data();
ClusterInfo::tvu_peers(self) ClusterInfo::tvu_peers(self)
.into_iter() .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| { .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.id != me.id
&& x.shred_version == me.shred_version && x.shred_version == me.shred_version
&& ContactInfo::is_valid_address(&x.serve_repair) && ContactInfo::is_valid_address(&x.serve_repair)
@ -536,7 +528,6 @@ impl ClusterInfo {
.map(|(epoch_slots, _)| epoch_slots.lowest <= slot) .map(|(epoch_slots, _)| epoch_slots.lowest <= slot)
.unwrap_or_else(|| /* fallback to legacy behavior */ true) .unwrap_or_else(|| /* fallback to legacy behavior */ true)
} }
>>>>>>> d0a468699... Avoid assigning the serve repair port to the storage port
}) })
.collect() .collect()
} }