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

Add unit-test-friendly VoteSignerProxy constructor

Browse Source
This commit is contained in:
Greg Fitzgerald
2019-01-25 19:47:05 -07:00
parent 1e43fb587e
commit 1bae87d4b3
13 changed files with 62 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/fullnode.rs
View File

@ -535,7 +535,6 @@ mod tests {
use crate::tvu::TvuReturnType;
use crate::vote_signer_proxy::VoteSignerProxy;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_vote_signer::rpc::LocalVoteSigner;
use std::cmp;
use std::fs::remove_dir_all;
use std::net::UdpSocket;
@ -559,7 +558,7 @@ mod tests {
let last_id = bank.last_id();
let keypair = Arc::new(keypair);
let signer = VoteSignerProxy::new(&keypair, Box::new(LocalVoteSigner::default()));
let signer = VoteSignerProxy::new_local(&keypair);
let v = Fullnode::new_with_bank(
keypair,
Some(Arc::new(signer)),
@ -602,7 +601,7 @@ mod tests {
let entry_height = 0;
let last_id = bank.last_id();
let keypair = Arc::new(keypair);
let signer = VoteSignerProxy::new(&keypair, Box::new(LocalVoteSigner::default()));
let signer = VoteSignerProxy::new_local(&keypair);
Fullnode::new_with_bank(
keypair,
Some(Arc::new(signer)),
@ -675,10 +674,7 @@ mod tests {
);
let bootstrap_leader_keypair = Arc::new(bootstrap_leader_keypair);
let signer = VoteSignerProxy::new(
&bootstrap_leader_keypair,
Box::new(LocalVoteSigner::default()),
);
let signer = VoteSignerProxy::new_local(&bootstrap_leader_keypair);
// Start up the leader
let mut bootstrap_leader = Fullnode::new(
bootstrap_leader_node,
@ -783,10 +779,7 @@ mod tests {
{
// Test that a node knows to transition to a validator based on parsing the ledger
let vote_signer = VoteSignerProxy::new(
&bootstrap_leader_keypair,
Box::new(LocalVoteSigner::default()),
);
let vote_signer = VoteSignerProxy::new_local(&bootstrap_leader_keypair);
let bootstrap_leader = Fullnode::new(
bootstrap_leader_node,
&bootstrap_leader_ledger_path,
@ -895,8 +888,7 @@ mod tests {
Some(bootstrap_height),
);
let vote_signer =
VoteSignerProxy::new(&validator_keypair, Box::new(LocalVoteSigner::default()));
let vote_signer = VoteSignerProxy::new_local(&validator_keypair);
// Start the validator
let validator = Fullnode::new(
validator_node,