From 0be59cad4e4d87329ab08fe64c8f0c83056d11b3 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 7 Mar 2019 12:24:30 -0800 Subject: [PATCH] Remove dead code --- core/src/cluster_info.rs | 4 +--- core/src/gossip_service.rs | 30 +----------------------------- 2 files changed, 2 insertions(+), 32 deletions(-) diff --git a/core/src/cluster_info.rs b/core/src/cluster_info.rs index 8c5e7a9bc..17653f249 100644 --- a/core/src/cluster_info.rs +++ b/core/src/cluster_info.rs @@ -305,9 +305,7 @@ impl ClusterInfo { pub fn purge(&mut self, now: u64) { self.gossip.purge(now); } - pub fn convergence(&self) -> usize { - self.gossip_peers().len() + 1 - } + pub fn rpc_peers(&self) -> Vec { let me = self.my_data().id; self.gossip diff --git a/core/src/gossip_service.rs b/core/src/gossip_service.rs index 96efa233b..3e2c824e6 100644 --- a/core/src/gossip_service.rs +++ b/core/src/gossip_service.rs @@ -2,10 +2,9 @@ use crate::bank_forks::BankForks; use crate::blocktree::Blocktree; -use crate::cluster_info::{ClusterInfo, Node, NodeInfo}; +use crate::cluster_info::{ClusterInfo, NodeInfo}; use crate::service::Service; use crate::streamer; -use solana_sdk::pubkey::Pubkey; use solana_sdk::signature::{Keypair, KeypairUtil}; use std::net::UdpSocket; use std::sync::atomic::{AtomicBool, Ordering}; @@ -50,33 +49,6 @@ impl GossipService { } } -pub fn make_listening_node( - leader: &NodeInfo, -) -> (GossipService, Arc>, Node, Pubkey) { - let keypair = Keypair::new(); - let exit = Arc::new(AtomicBool::new(false)); - let new_node = Node::new_localhost_with_pubkey(keypair.pubkey()); - let new_node_info = new_node.info.clone(); - let id = new_node.info.id; - let mut new_node_cluster_info = ClusterInfo::new(new_node_info, Arc::new(keypair)); - new_node_cluster_info.insert_info(leader.clone()); - new_node_cluster_info.set_leader(leader.id); - let new_node_cluster_info_ref = Arc::new(RwLock::new(new_node_cluster_info)); - let gossip_service = GossipService::new( - &new_node_cluster_info_ref, - None, - None, - new_node - .sockets - .gossip - .try_clone() - .expect("Failed to clone gossip"), - &exit, - ); - - (gossip_service, new_node_cluster_info_ref, new_node, id) -} - pub fn discover( entry_point_info: &NodeInfo, num_nodes: usize,