From fa65107460a6753a676696a605852efe88f10f58 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Mon, 24 May 2021 14:40:47 -0600
Subject: [PATCH] Avoid ip_echo_server unwrap (#17445)

(cherry picked from commit 30b60a976b6ccd155aedea179879255a1b8f77e8)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 core/src/validator.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/core/src/validator.rs b/core/src/validator.rs
index 72a5e35514..2e7b7bdedc 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -276,7 +276,7 @@ pub struct Validator {
     poh_service: PohService,
     tpu: Tpu,
     tvu: Tvu,
-    ip_echo_server: solana_net_utils::IpEchoServer,
+    ip_echo_server: Option<solana_net_utils::IpEchoServer>,
 }
 
 // in the distant future, get rid of ::new()/exit() and use Result properly...
@@ -591,7 +591,7 @@ impl Validator {
             std::thread::park();
         }
 
-        let ip_echo_server = solana_net_utils::ip_echo_server(node.sockets.ip_echo.unwrap());
+        let ip_echo_server = node.sockets.ip_echo.map(solana_net_utils::ip_echo_server);
 
         let gossip_service = GossipService::new(
             &cluster_info,
@@ -887,7 +887,9 @@ impl Validator {
         self.completed_data_sets_service
             .join()
             .expect("completed_data_sets_service");
-        self.ip_echo_server.shutdown_background();
+        if let Some(ip_echo_server) = self.ip_echo_server {
+            ip_echo_server.shutdown_background();
+        }
     }
 }