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

Revert ill-advised jsonrpc marker, and handle jsonrpc server close

Browse Source
This commit is contained in:
Tyera Eulberg
2018-08-15 15:11:38 -06:00
committed by Tyera Eulberg
parent d69d79612b
commit f73f3941cd
6 changed files with 28 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/multinode.rs
View File

@ -145,14 +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,
false,
);
let leader = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -170,7 +163,6 @@ fn test_multi_node_ledger_window() -> result::Result<()> {
&zero_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
// contains the leader and new node
@ -226,14 +218,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,
false,
);
let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -256,7 +241,6 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
nodes.push(val);
}
@ -292,7 +276,6 @@ fn test_multi_node_validator_catchup_from_zero() -> result::Result<()> {
&zero_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
nodes.push(val);
//contains the leader and new node
@ -352,14 +335,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,
false,
);
let server = Fullnode::new(leader, true, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance =
@ -378,7 +354,6 @@ fn test_multi_node_basic() {
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
nodes.push(val);
}
@ -421,14 +396,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,
false,
);
let leader_fullnode = Fullnode::new(leader, true, &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);
@ -447,7 +415,6 @@ fn test_boot_validator_from_file() -> result::Result<()> {
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
let mut client = mk_client(&validator_data);
let getbal = retry_get_balance(&mut client, &bob_pubkey, Some(leader_balance));
@ -466,7 +433,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, false);
let leader_fullnode = Fullnode::new(leader, true, &ledger_path, leader_keypair, None);
(leader_data, leader_fullnode)
}
@ -517,7 +484,6 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
&stale_ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
// trigger broadcast, validator should catch up from leader, whose window contains
@ -572,14 +538,8 @@ 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,
false,
);
let server =
Fullnode::new_without_sigverify(leader, true, &leader_ledger_path, leader_keypair, None);
// Send leader some tokens to vote
let leader_balance = send_tx_and_retry_get_balance(
@ -653,7 +613,6 @@ fn test_multi_node_dynamic_network() {
&ledger_path,
keypair,
Some(leader_data.contact_info.ncp),
false,
);
(rd, val)
})