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

Clean up test_leader_restart_validator_start_from_old_ledger

Browse Source
This commit is contained in:
Michael Vines
2019-02-26 10:36:35 -08:00
committed by Grimes
parent 411f154827
commit a7f200847f
1 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
tests/multinode.rs
View File

@ -565,17 +565,18 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
create_leader(&ledger_path, leader_keypair.clone(), voting_keypair); create_leader(&ledger_path, leader_keypair.clone(), voting_keypair);
let leader_fullnode_exit = leader_fullnode.run(None); let leader_fullnode_exit = leader_fullnode.run(None);
// lengthen the ledger // Give bob 500 tokens via the leader
let leader_balance = assert_eq!(
send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, 500, Some(500)) send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, 500, Some(500))
.unwrap(); .unwrap(),
assert_eq!(leader_balance, 500); 500
);
// restart the leader // restart the leader
leader_fullnode_exit(); leader_fullnode_exit();
} }
// create a "stale" ledger by copying current ledger // Create a "stale" ledger by copying current ledger where bob only has 500 tokens
let stale_ledger_path = tmp_copy_blocktree( let stale_ledger_path = tmp_copy_blocktree(
&ledger_path, &ledger_path,
"leader_restart_validator_start_from_old_ledger", "leader_restart_validator_start_from_old_ledger",
@ -587,13 +588,13 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
create_leader(&ledger_path, leader_keypair.clone(), voting_keypair); create_leader(&ledger_path, leader_keypair.clone(), voting_keypair);
let leader_fullnode_exit = leader_fullnode.run(None); let leader_fullnode_exit = leader_fullnode.run(None);
// lengthen the ledger // Give bob 500 more tokens via the leader
let leader_balance = assert_eq!(
send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, 500, Some(1000)) send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, 500, Some(1000))
.unwrap(); .unwrap(),
assert_eq!(leader_balance, 1000); 1000
);
// restart the leader
leader_fullnode_exit(); leader_fullnode_exit();
} }
@ -602,7 +603,7 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
create_leader(&ledger_path, leader_keypair, voting_keypair); create_leader(&ledger_path, leader_keypair, voting_keypair);
let leader_fullnode_exit = leader_fullnode.run(None); let leader_fullnode_exit = leader_fullnode.run(None);
// start validator from old ledger // Start validator from "stale" ledger
let keypair = Arc::new(Keypair::new()); let keypair = Arc::new(Keypair::new());
let validator = Node::new_localhost_with_pubkey(keypair.pubkey()); let validator = Node::new_localhost_with_pubkey(keypair.pubkey());
let validator_data = validator.info.clone(); let validator_data = validator.info.clone();
@ -619,26 +620,25 @@ fn test_leader_restart_validator_start_from_old_ledger() -> result::Result<()> {
); );
let val_fullnode_exit = val_fullnode.run(None); let val_fullnode_exit = val_fullnode.run(None);
// trigger broadcast, validator should catch up from leader, whose window contains // Validator should catch up from leader whose window contains the entries missing from the
// the entries missing from the stale ledger // stale ledger send requests so the validator eventually sees a gap and requests a repair
// send requests so the validator eventually sees a gap and requests a repair let expected_bob_balance = 1000;
let mut expected = 1500; let mut validator_client = mk_client(&validator_data);
let mut client = mk_client(&validator_data);
for _ in 0..solana::window_service::MAX_REPAIR_BACKOFF {
let leader_balance =
send_tx_and_retry_get_balance(&leader_data, &alice, &bob_pubkey, 500, Some(expected))
.unwrap();
assert_eq!(leader_balance, expected);
let getbal = retry_get_balance(&mut client, &bob_pubkey, Some(leader_balance)); for _ in 0..42 {
if getbal == Some(leader_balance) { let balance = retry_get_balance(
&mut validator_client,
&bob_pubkey,
Some(expected_bob_balance),
);
info!(
"Bob balance at the validator is {:?} (expecting {:?})",
balance, expected_bob_balance
);
if balance == Some(expected_bob_balance) {
break; break;
} }
expected += 500;
} }
let getbal = retry_get_balance(&mut client, &bob_pubkey, Some(expected));
assert_eq!(getbal, Some(expected));
val_fullnode_exit(); val_fullnode_exit();
leader_fullnode_exit(); leader_fullnode_exit();