Only check the entrypoint's RPC address (#6851)

2019-11-09 00:56:31 -07:00
parent 24a7b0ce74
commit 0fbd508c5f
2 changed files with 18 additions and 8 deletions
--- a/gossip/src/main.rs
+++ b/gossip/src/main.rs
@@ -203,10 +203,13 @@ fn main() -> Result<(), Box<dyn error::Error>> {

            let rpc_addrs: Vec<_> = nodes
                .iter()
-                .filter_map(ContactInfo::valid_client_facing_addr)
-                .map(|addrs| addrs.0)
-                .filter(|rpc_addr| {
-                    matches.is_present("all") || rpc_addr.ip() == entrypoint_addr.ip()
+                .filter_map(|contact_info| {
+                    if (matches.is_present("all") || contact_info.gossip == entrypoint_addr)
+                        && ContactInfo::is_valid_address(&contact_info.rpc)
+                    {
+                        return Some(contact_info.rpc);
+                    }
+                    None
                })
                .collect();