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

setup_leader_validator: remove unnecessary ticks_per_slot parameter

This commit is contained in:
Michael Vines 2019-02-12 19:38:45 -08:00 committed by Grimes
parent 2de0a9e453
commit 1eabe66c85
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fullnode.rs
View File

@ -704,9 +704,8 @@ mod tests {
0, 0,
// Generate enough ticks for two epochs to flush the bootstrap_leader's vote at // Generate enough ticks for two epochs to flush the bootstrap_leader's vote at
// tick_height = 0 from the leader scheduler's active window // tick_height = 0 from the leader scheduler's active window
ticks_per_slot * 4, ticks_per_slot * slots_per_epoch * 2,
"test_wrong_role_transition", "test_wrong_role_transition",
ticks_per_slot,
&blocktree_config, &blocktree_config,
); );
let bootstrap_leader_info = bootstrap_leader_node.info.clone(); let bootstrap_leader_info = bootstrap_leader_node.info.clone();
@ -781,7 +780,6 @@ mod tests {
0, 0,
0, 0,
"test_validator_to_leader_transition", "test_validator_to_leader_transition",
ticks_per_slot,
&fullnode_config.ledger_config(), &fullnode_config.ledger_config(),
); );
@ -883,7 +881,6 @@ mod tests {
1, 1,
0, 0,
"test_tvu_behind", "test_tvu_behind",
ticks_per_slot,
&fullnode_config.ledger_config(), &fullnode_config.ledger_config(),
); );
@ -999,14 +996,13 @@ mod tests {
num_genesis_ticks: u64, num_genesis_ticks: u64,
num_ending_ticks: u64, num_ending_ticks: u64,
test_name: &str, test_name: &str,
ticks_per_slot: u64, blocktree_config: &BlocktreeConfig,
config: &BlocktreeConfig,
) -> (Node, Node, String, u64, Hash) { ) -> (Node, Node, String, u64, Hash) {
// Make a leader identity // Make a leader identity
let leader_node = Node::new_localhost_with_pubkey(leader_keypair.pubkey()); let leader_node = Node::new_localhost_with_pubkey(leader_keypair.pubkey());
// Create validator identity // Create validator identity
assert!(num_genesis_ticks <= ticks_per_slot); assert!(num_genesis_ticks <= blocktree_config.ticks_per_slot);
let (mint_keypair, ledger_path, tick_height, mut entry_height, last_id, last_entry_id) = let (mint_keypair, ledger_path, tick_height, mut entry_height, last_id, last_entry_id) =
create_tmp_sample_ledger( create_tmp_sample_ledger(
test_name, test_name,
@ -1014,18 +1010,12 @@ mod tests {
num_genesis_ticks, num_genesis_ticks,
leader_node.info.id, leader_node.info.id,
500, 500,
config, blocktree_config,
); );
let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey()); let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey());
// Write two entries so that the validator is in the active set: // Write two entries so that the validator is in the active set:
//
// 1) Give the validator a nonzero number of tokens
// Write the bootstrap entries to the ledger that will cause leader rotation
// after the bootstrap height
//
// 2) A vote from the validator
let (active_set_entries, _) = make_active_set_entries( let (active_set_entries, _) = make_active_set_entries(
validator_keypair, validator_keypair,
&mint_keypair, &mint_keypair,
@ -1036,7 +1026,7 @@ mod tests {
num_ending_ticks, num_ending_ticks,
); );
let blocktree = Blocktree::open_config(&ledger_path, config).unwrap(); let blocktree = Blocktree::open_config(&ledger_path, blocktree_config).unwrap();
let active_set_entries_len = active_set_entries.len() as u64; let active_set_entries_len = active_set_entries.len() as u64;
let last_id = active_set_entries.last().unwrap().id; let last_id = active_set_entries.last().unwrap().id;