blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid ip_echo_server unwrap

This commit is contained in:
Michael Vines 2021-05-24 08:28:44 -07:00
parent ad1f24d487
commit 30b60a976b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/validator.rs
View File

@ -278,7 +278,7 @@ pub struct Validator {
poh_service: PohService, poh_service: PohService,
tpu: Tpu, tpu: Tpu,
tvu: Tvu, 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... // in the distant future, get rid of ::new()/exit() and use Result properly...
@ -593,7 +593,7 @@ impl Validator {
std::thread::park(); 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( let gossip_service = GossipService::new(
&cluster_info, &cluster_info,
@ -890,7 +890,9 @@ impl Validator {
self.completed_data_sets_service self.completed_data_sets_service
.join() .join()
.expect("completed_data_sets_service"); .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();
}
} }
} }