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

Rework discover to handle additional parameters, and be unit-testable

Browse Source
This commit is contained in:
Tyera Eulberg
2019-04-01 17:11:42 -06:00
committed by Tyera Eulberg
parent 5b7d5e2e02
commit 6ff2a0a75e
9 changed files with 145 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/local_cluster.rs
View File

@ -3,7 +3,7 @@ extern crate solana;
use solana::cluster::Cluster;
use solana::cluster_tests;
use solana::fullnode::FullnodeConfig;
use solana::gossip_service::discover;
use solana::gossip_service::discover_nodes;
use solana::local_cluster::LocalCluster;
use solana::poh_service::PohServiceConfig;
use solana_sdk::timing;
@ -115,7 +115,7 @@ fn test_forwarding() {
let fullnode_config = FullnodeConfig::default();
let cluster = LocalCluster::new_with_config(&[999_990, 3], 2_000_000, &fullnode_config);
let cluster_nodes = discover(&cluster.entry_point_info.gossip, 2).unwrap();
let cluster_nodes = discover_nodes(&cluster.entry_point_info.gossip, 2).unwrap();
assert!(cluster_nodes.len() >= 2);
let leader_id = cluster.entry_point_info.id;

6
core/tests/replicator.rs
View File

@ -9,7 +9,7 @@ use solana::blocktree::{create_new_tmp_ledger, Blocktree};
use solana::cluster_info::{ClusterInfo, Node, FULLNODE_PORT_RANGE};
use solana::contact_info::ContactInfo;
use solana::fullnode::FullnodeConfig;
use solana::gossip_service::discover;
use solana::gossip_service::discover_nodes;
use solana::local_cluster::LocalCluster;
use solana::replicator::Replicator;
use solana::replicator::ReplicatorRequest;
@ -116,7 +116,7 @@ fn run_replicator_startup_basic(num_nodes: usize, num_replicators: usize) {
DEFAULT_SLOTS_PER_EPOCH,
);
let cluster_nodes = discover(
let cluster_nodes = discover_nodes(
&cluster.entry_point_info.gossip,
num_nodes + num_replicators,
)
@ -230,7 +230,7 @@ fn test_account_setup() {
DEFAULT_SLOTS_PER_EPOCH,
);
let _ = discover(
let _ = discover_nodes(
&cluster.entry_point_info.gossip,
num_nodes + num_replicators,
)