blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename kp variables to keypair

This commit is contained in:
Greg Fitzgerald 2018-08-09 08:57:24 -06:00
parent c2bbe4344e
commit b2067d2721
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/crdt.rs
View File

@ -1597,12 +1597,12 @@ mod tests {
}
#[test]
fn replicated_data_new_leader_with_pubkey() {
let kp = Keypair::new();
let keypair = Keypair::new();
let d1 = NodeInfo::new_leader_with_pubkey(
kp.pubkey().clone(),
keypair.pubkey().clone(),
&"127.0.0.1:1234".parse().unwrap(),
);
assert_eq!(d1.id, kp.pubkey());
assert_eq!(d1.id, keypair.pubkey());
assert_eq!(d1.contact_info.ncp, "127.0.0.1:1235".parse().unwrap());
assert_eq!(d1.contact_info.tvu, "127.0.0.1:1236".parse().unwrap());
assert_eq!(d1.contact_info.rpu, "127.0.0.1:1237".parse().unwrap());

12
src/fullnode.rs
View File

@ -382,13 +382,13 @@ mod tests {
#[test]
fn validator_exit() {
let kp = Keypair::new();
let tn = TestNode::new_localhost_with_pubkey(kp.pubkey());
let keypair = Keypair::new();
let tn = TestNode::new_localhost_with_pubkey(keypair.pubkey());
let alice = Mint::new(10_000);
let bank = Bank::new(&alice);
let exit = Arc::new(AtomicBool::new(false));
let entry = tn.data.clone();
let v = FullNode::new_validator(kp, bank, 0, None, tn, &entry, exit, None, false);
let v = FullNode::new_validator(keypair, bank, 0, None, tn, &entry, exit, None, false);
v.exit();
v.join().unwrap();
}
@ -396,13 +396,13 @@ mod tests {
fn validator_parallel_exit() {
let vals: Vec<FullNode> = (0..2)
.map(|_| {
let kp = Keypair::new();
let tn = TestNode::new_localhost_with_pubkey(kp.pubkey());
let keypair = Keypair::new();
let tn = TestNode::new_localhost_with_pubkey(keypair.pubkey());
let alice = Mint::new(10_000);
let bank = Bank::new(&alice);
let exit = Arc::new(AtomicBool::new(false));
let entry = tn.data.clone();
FullNode::new_validator(kp, bank, 0, None, tn, &entry, exit, None, false)
FullNode::new_validator(keypair, bank, 0, None, tn, &entry, exit, None, false)
})
.collect();
//each validator can exit in parallel to speed many sequential calls to `join`