Various fixes/improvements resulting from SLP 1.1 restart debug (bp #8019) (#8026)

automerge
2020-01-29 20:11:23 -08:00
parent 8a9a9cb991
commit 0f8c9ab1c4
6 changed files with 128 additions and 38 deletions
--- a/core/src/rpc.rs
+++ b/core/src/rpc.rs
@@ -728,11 +728,14 @@ impl RpcSol for RpcSolImpl {
                None
            }
        }
+        let shred_version = cluster_info.my_data().shred_version;
        Ok(cluster_info
            .all_peers()
            .iter()
            .filter_map(|(contact_info, _)| {
-                if ContactInfo::is_valid_address(&contact_info.gossip) {
+                if shred_version == contact_info.shred_version
+                    && ContactInfo::is_valid_address(&contact_info.gossip)
+                {
                    Some(RpcContactInfo {
                        pubkey: contact_info.id.to_string(),
                        gossip: Some(contact_info.gossip),