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

Drop a bunch of dependencies on VotingKeypair 

And de-Arc
This commit is contained in:
Greg Fitzgerald 2019-02-20 09:54:07 -07:00
parent af1b8f8a26
commit fb1c6cf4da
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/leader_scheduler.rs
View File

@ -467,9 +467,9 @@ pub mod tests {
let mut validators = vec![]; let mut validators = vec![];
let last_id = genesis_block.last_id(); let last_id = genesis_block.last_id();
for i in 0..num_validators { for i in 0..num_validators {
let new_validator = Arc::new(Keypair::new()); let new_validator = Keypair::new();
let new_pubkey = new_validator.pubkey(); let new_pubkey = new_validator.pubkey();
let voting_keypair = VotingKeypair::new_local(&new_validator); let voting_keypair = Keypair::new();
validators.push(new_pubkey); validators.push(new_pubkey);
let stake = (i + 42) as u64; let stake = (i + 42) as u64;
info!("validator {}: stake={} pubkey={}", i, stake, new_pubkey); info!("validator {}: stake={} pubkey={}", i, stake, new_pubkey);
@ -628,7 +628,7 @@ pub mod tests {
let num_old_ids = 20; let num_old_ids = 20;
let mut old_ids = HashSet::new(); let mut old_ids = HashSet::new();
for _ in 0..num_old_ids { for _ in 0..num_old_ids {
let new_keypair = Arc::new(Keypair::new()); let new_keypair = Keypair::new();
let pk = new_keypair.pubkey(); let pk = new_keypair.pubkey();
old_ids.insert(pk.clone()); old_ids.insert(pk.clone());
@ -637,7 +637,7 @@ pub mod tests {
.unwrap(); .unwrap();
// Create a vote account // Create a vote account
let voting_keypair = VotingKeypair::new_local(&new_keypair); let voting_keypair = Keypair::new();
new_vote_account( new_vote_account(
&new_keypair, &new_keypair,
&voting_keypair, &voting_keypair,
@ -659,7 +659,7 @@ pub mod tests {
let num_new_ids = 10; let num_new_ids = 10;
let mut new_ids = HashSet::new(); let mut new_ids = HashSet::new();
for _ in 0..num_new_ids { for _ in 0..num_new_ids {
let new_keypair = Arc::new(Keypair::new()); let new_keypair = Keypair::new();
let pk = new_keypair.pubkey(); let pk = new_keypair.pubkey();
new_ids.insert(pk); new_ids.insert(pk);
// Give the account some stake // Give the account some stake
@ -667,7 +667,7 @@ pub mod tests {
.unwrap(); .unwrap();
// Create a vote account // Create a vote account
let voting_keypair = VotingKeypair::new_local(&new_keypair); let voting_keypair = Keypair::new();
new_vote_account( new_vote_account(
&new_keypair, &new_keypair,
&voting_keypair, &voting_keypair,
@ -919,9 +919,9 @@ pub mod tests {
let mut validators = vec![]; let mut validators = vec![];
let last_id = genesis_block.last_id(); let last_id = genesis_block.last_id();
for i in 0..num_validators { for i in 0..num_validators {
let new_validator = Arc::new(Keypair::new()); let new_validator = Keypair::new();
let new_pubkey = new_validator.pubkey(); let new_pubkey = new_validator.pubkey();
let voting_keypair = VotingKeypair::new_local(&new_validator); let voting_keypair = Keypair::new();
validators.push(new_pubkey); validators.push(new_pubkey);
// Give the validator some tokens // Give the validator some tokens
bank.transfer( bank.transfer(
@ -979,7 +979,7 @@ pub mod tests {
#[test] #[test]
fn test_multiple_vote() { fn test_multiple_vote() {
let leader_keypair = Arc::new(Keypair::new()); let leader_keypair = Keypair::new();
let leader_id = leader_keypair.pubkey(); let leader_id = leader_keypair.pubkey();
let active_window_tick_length = 1000; let active_window_tick_length = 1000;
let (genesis_block, _mint_keypair) = GenesisBlock::new_with_leader(10000, leader_id, 500); let (genesis_block, _mint_keypair) = GenesisBlock::new_with_leader(10000, leader_id, 500);
@ -1006,7 +1006,7 @@ pub mod tests {
// Check that a node that votes twice in a row will get included in the active // Check that a node that votes twice in a row will get included in the active
// window // window
let voting_keypair = VotingKeypair::new_local(&leader_keypair); let voting_keypair = Keypair::new();
// Create a vote account // Create a vote account
new_vote_account( new_vote_account(
&leader_keypair, &leader_keypair,