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

Less copy pasta

This commit is contained in:
Greg Fitzgerald 2019-02-20 10:29:29 -07:00
parent fb1c6cf4da
commit 6e24a4aa50
3 changed files with 47 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/active_stakers.rs
View File

@ -68,34 +68,35 @@ impl ActiveStakers {
pub mod tests {
use solana_runtime::bank::Bank;
use solana_sdk::hash::Hash;
use solana_sdk::pubkey::Pubkey;
use solana_sdk::signature::{Keypair, KeypairUtil};
use solana_sdk::vote_transaction::VoteTransaction;
pub fn new_vote_account<T: KeypairUtil>(
pub fn new_vote_account(
from_keypair: &Keypair,
voting_pubkey: &Pubkey,
bank: &Bank,
num_tokens: u64,
) {
let last_id = bank.last_id();
let tx = VoteTransaction::new_account(from_keypair, *voting_pubkey, last_id, num_tokens, 0);
bank.process_transaction(&tx).unwrap();
}
pub fn push_vote<T: KeypairUtil>(voting_keypair: &T, bank: &Bank, tick_height: u64) {
let last_id = bank.last_id();
let tx = VoteTransaction::new_vote(voting_keypair, tick_height, last_id, 0);
bank.process_transaction(&tx).unwrap();
}
pub fn new_vote_account_with_vote<T: KeypairUtil>(
from_keypair: &Keypair,
voting_keypair: &T,
bank: &Bank,
num_tokens: u64,
last_id: Hash,
) {
let tx = VoteTransaction::new_account(
from_keypair,
voting_keypair.pubkey(),
last_id,
num_tokens,
0,
);
bank.process_transaction(&tx).unwrap();
}
pub fn push_vote<T: KeypairUtil>(
voting_keypair: &T,
bank: &Bank,
tick_height: u64,
last_id: Hash,
) {
let new_vote_tx = VoteTransaction::new_vote(voting_keypair, tick_height, last_id, 0);
bank.process_transaction(&new_vote_tx).unwrap();
new_vote_account(from_keypair, &voting_keypair.pubkey(), bank, num_tokens);
push_vote(voting_keypair, bank, tick_height);
}
}

9
src/leader_confirmation_service.rs
View File

@ -133,7 +133,7 @@ impl Service for LeaderConfirmationService {
#[cfg(test)]
pub mod tests {
use super::*;
use crate::active_stakers::tests::new_vote_account;
use crate::active_stakers::tests::{new_vote_account, push_vote};
use crate::voting_keypair::VotingKeypair;
use bincode::serialize;
use solana_sdk::genesis_block::GenesisBlock;
@ -169,16 +169,15 @@ pub mod tests {
let validator_keypair = Arc::new(Keypair::new());
let last_id = ids[i];
let voting_keypair = VotingKeypair::new_local(&validator_keypair);
let voting_pubkey = voting_keypair.pubkey();
// Give the validator some tokens
bank.transfer(2, &mint_keypair, validator_keypair.pubkey(), last_id)
.unwrap();
new_vote_account(&validator_keypair, &voting_keypair, &bank, 1, last_id);
new_vote_account(&validator_keypair, &voting_pubkey, &bank, 1);
if i < 6 {
let vote_tx =
VoteTransaction::new_vote(&voting_keypair, (i + 1) as u64, last_id, 0);
bank.process_transaction(&vote_tx).unwrap();
push_vote(&voting_keypair, &bank, (i + 1) as u64);
}
(voting_keypair, validator_keypair)
})

116
src/leader_scheduler.rs
View File

@ -428,7 +428,7 @@ pub fn make_active_set_entries(
#[cfg(test)]
pub mod tests {
use super::*;
use crate::active_stakers::tests::{new_vote_account, push_vote};
use crate::active_stakers::tests::{new_vote_account_with_vote, push_vote};
use hashbrown::HashSet;
use solana_sdk::genesis_block::{GenesisBlock, BOOTSTRAP_LEADER_TOKENS};
use std::hash::Hash as StdHash;
@ -477,22 +477,14 @@ pub mod tests {
bank.transfer(stake, &mint_keypair, new_pubkey, last_id)
.unwrap();
// Create a vote account
new_vote_account(
// Vote to make the validator part of the active set for the entire test
// (we made the active_window_tick_length large enough at the beginning of the test)
new_vote_account_with_vote(
&new_validator,
&voting_keypair,
&bank,
num_vote_account_tokens as u64,
genesis_block.last_id(),
);
// Vote to make the validator part of the active set for the entire test
// (we made the active_window_tick_length large enough at the beginning of the test)
push_vote(
&voting_keypair,
&bank,
ticks_per_epoch,
genesis_block.last_id(),
);
}
@ -636,23 +628,8 @@ pub mod tests {
bank.transfer(5, &mint_keypair, pk, genesis_block.last_id())
.unwrap();
// Create a vote account
let voting_keypair = Keypair::new();
new_vote_account(
&new_keypair,
&voting_keypair,
&bank,
1,
genesis_block.last_id(),
);
// Push a vote for the account
push_vote(
&voting_keypair,
&bank,
start_height,
genesis_block.last_id(),
);
// Create a vote account and push a vote
new_vote_account_with_vote(&new_keypair, &Keypair::new(), &bank, 1, start_height);
}
// Insert a bunch of votes at height "start_height + active_window_tick_length"
@ -666,22 +643,9 @@ pub mod tests {
bank.transfer(5, &mint_keypair, pk, genesis_block.last_id())
.unwrap();
// Create a vote account
let voting_keypair = Keypair::new();
new_vote_account(
&new_keypair,
&voting_keypair,
&bank,
1,
genesis_block.last_id(),
);
push_vote(
&voting_keypair,
&bank,
start_height + active_window_tick_length + 1,
genesis_block.last_id(),
);
// Create a vote account and push a vote
let tick_height = start_height + active_window_tick_length + 1;
new_vote_account_with_vote(&new_keypair, &Keypair::new(), &bank, 1, tick_height);
}
// Query for the active set at various heights
@ -932,21 +896,9 @@ pub mod tests {
)
.unwrap();
// Create a vote account
new_vote_account(
&new_validator,
&voting_keypair,
&bank,
num_vote_account_tokens as u64,
genesis_block.last_id(),
);
push_vote(
&voting_keypair,
&bank,
(i + 2) * active_window_tick_length - 1,
genesis_block.last_id(),
);
// Create a vote account and push a vote
let tick_height = (i + 2) * active_window_tick_length - 1;
new_vote_account_with_vote(&new_validator, &voting_keypair, &bank, 1, tick_height);
}
// Generate schedule every active_window_tick_length entries and check that
@ -1006,18 +958,9 @@ pub mod tests {
// Check that a node that votes twice in a row will get included in the active
// window
let voting_keypair = Keypair::new();
// Create a vote account
new_vote_account(
&leader_keypair,
&voting_keypair,
&bank,
1,
genesis_block.last_id(),
);
// Vote at tick_height 1
push_vote(&voting_keypair, &bank, 1, genesis_block.last_id());
let voting_keypair = Keypair::new();
new_vote_account_with_vote(&leader_keypair, &voting_keypair, &bank, 1, 1);
{
let mut leader_scheduler = leader_scheduler.write().unwrap();
@ -1029,7 +972,7 @@ pub mod tests {
}
// Vote at tick_height 2
push_vote(&voting_keypair, &bank, 2, genesis_block.last_id());
push_vote(&voting_keypair, &bank, 2);
{
let mut leader_scheduler = leader_scheduler.write().unwrap();
@ -1203,21 +1146,14 @@ pub mod tests {
if add_validator {
bank.transfer(5, &mint_keypair, validator_id, last_id)
.unwrap();
// Create a vote account
let voting_keypair = VotingKeypair::new_local(&validator_keypair);
new_vote_account(
// Create a vote account and push a vote
new_vote_account_with_vote(
&validator_keypair,
&voting_keypair,
&Keypair::new(),
&bank,
1,
genesis_block.last_id(),
);
push_vote(
&voting_keypair,
&bank,
initial_vote_height,
genesis_block.last_id(),
);
}
@ -1238,22 +1174,14 @@ pub mod tests {
)
.unwrap();
// Create a vote account
let voting_keypair = VotingKeypair::new_local(&bootstrap_leader_keypair);
new_vote_account(
// Create a vote account and push a vote to add the leader to the active set
let voting_keypair = Keypair::new();
new_vote_account_with_vote(
&bootstrap_leader_keypair,
&voting_keypair,
&bank,
vote_account_tokens as u64,
genesis_block.last_id(),
);
// Add leader to the active set
push_vote(
&voting_keypair,
&bank,
initial_vote_height,
genesis_block.last_id(),
);
let leader_scheduler_config =