gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove spy_node duplication

Browse Source
This commit is contained in:
Michael Vines
2019-03-06 17:08:40 -08:00
parent 96c0222b30
commit 8bc7d5a172
6 changed files with 31 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/cluster_info.rs
View File

@@ -1257,21 +1257,11 @@ impl ClusterInfo {
.unwrap()
}
pub fn spy_node() -> (NodeInfo, UdpSocket) {
pub fn spy_node(id: &Pubkey) -> (NodeInfo, UdpSocket) {
let (_, gossip_socket) = bind_in_range(FULLNODE_PORT_RANGE).unwrap();
let pubkey = Keypair::new().pubkey();
let daddr = socketaddr_any!();
let node = NodeInfo::new(
pubkey,
daddr,
daddr,
daddr,
daddr,
daddr,
daddr,
timestamp(),
);
let node = NodeInfo::new(*id, daddr, daddr, daddr, daddr, daddr, daddr, timestamp());
(node, gossip_socket)
}
}
@@ -1460,7 +1450,7 @@ mod tests {
fn test_cluster_spy_gossip() {
//check that gossip doesn't try to push to invalid addresses
let node = Node::new_localhost();
let (spy, _) = ClusterInfo::spy_node();
let (spy, _) = ClusterInfo::spy_node(&Keypair::new().pubkey());
let cluster_info = Arc::new(RwLock::new(ClusterInfo::new_with_invalid_keypair(
node.info,
)));