From 0fbd508c5f21a029e4d2edf2f9c165ab62ef0419 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sat, 9 Nov 2019 00:56:31 -0700
Subject: [PATCH] Only check the entrypoint's RPC address (#6851)

---
 gossip/src/main.rs    | 11 +++++++----
 validator/src/main.rs | 15 +++++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/gossip/src/main.rs b/gossip/src/main.rs
index 8eb8f620d..cb7143fcd 100644
--- 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();
 
diff --git a/validator/src/main.rs b/validator/src/main.rs
index 121943205..9c9cec2c3 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -181,13 +181,20 @@ fn initialize_ledger_path(
 
     let rpc_addr = nodes
         .iter()
-        .filter_map(ContactInfo::valid_client_facing_addr)
-        .map(|addrs| addrs.0)
-        .find(|rpc_addr| rpc_addr.ip() == entrypoint.gossip.ip())
+        .filter_map(|contact_info| {
+            if contact_info.gossip == entrypoint.gossip
+                && ContactInfo::is_valid_address(&contact_info.rpc)
+            {
+                Some(contact_info.rpc)
+            } else {
+                None
+            }
+        })
+        .next()
         .unwrap_or_else(|| {
             error!(
                 "Entrypoint ({:?}) is not running the RPC service",
-                entrypoint.gossip.ip()
+                entrypoint.gossip
             );
             exit(1);
         });