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

Don't offer two ways to specify a leader

Browse Source
This commit is contained in:
Greg Fitzgerald
2018-08-22 16:51:19 -06:00
committed by Grimes
parent cfac127e4c
commit 9c5e69bf3d
3 changed files with 49 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/multinode.rs
View File

@ -145,7 +145,7 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
writer.write_entries(entries).unwrap();
}
let leader = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
let leader = Fullnode::new(leader, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -159,7 +159,6 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
let validator_data = validator.data.clone();
let validator = Fullnode::new(
validator,
false,
&zero_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -218,7 +217,7 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
);
ledger_paths.push(zero_ledger_path.clone());
let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
let server = Fullnode::new(leader, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -237,7 +236,6 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
let mut val = Fullnode::new(
validator,
false,
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -272,7 +270,6 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
let validator = TestNode::new_localhost_with_pubkey(keypair.pubkey());
let val = Fullnode::new(
validator,
false,
&zero_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -335,7 +332,7 @@ fn test_multi_node_basic() {
let (alice, leader_ledger_path) = genesis("multi_node_basic", 10_000);
ledger_paths.push(leader_ledger_path.clone());
let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
let server = Fullnode::new(leader, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -350,7 +347,6 @@ fn test_multi_node_basic() {
ledger_paths.push(ledger_path.clone());
let val = Fullnode::new(
validator,
false,
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -396,7 +392,7 @@ fn test_boot_validator_from_file() -> result::Result<()> {
ledger_paths.push(leader_ledger_path.clone());
let leader_data = leader.data.clone();
let leader_fullnode = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
let leader_fullnode = Fullnode::new(leader, &leader_ledger_path, leader_keypair, None);
let leader_balance =
send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, Some(500)).unwrap();
assert_eq!(leader_balance, 500);
@ -411,7 +407,6 @@ fn test_boot_validator_from_file() -> result::Result<()> {
ledger_paths.push(ledger_path.clone());
let val_fullnode = Fullnode::new(
validator,
false,
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -433,7 +428,7 @@ fn create_leader(ledger_path: &str) -> (NodeInfo, Fullnode) {
let leader_keypair = Keypair::new();
let leader = TestNode::new_localhost_with_pubkey(leader_keypair.pubkey());
let leader_data = leader.data.clone();
let leader_fullnode = Fullnode::new(leader, true, &ledger_path, leader_keypair, None);
let leader_fullnode = Fullnode::new(leader, &ledger_path, leader_keypair, None);
(leader_data, leader_fullnode)
}
@ -480,7 +475,6 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
let val_fullnode = Fullnode::new(
validator,
false,
&stale_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
@ -538,8 +532,7 @@ fn test_multi_node_dynamic_network() {
let alice_arc = Arc::new(RwLock::new(alice));
let leader_data = leader.data.clone();
let server =
Fullnode::new_without_sigverify(leader, true, &leader_ledger_path, leader_keypair, None);
let server = Fullnode::new_without_sigverify(leader, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance = send_tx_and_retry_get_balance(
@ -609,7 +602,6 @@ fn test_multi_node_dynamic_network() {
info!("starting {} {:x}", keypair.pubkey(), rd.debug_id());
let val = Fullnode::new_without_sigverify(
validator,
false,
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),