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

Migrate fullnode to create_tmp_sample_blocktree

This commit is contained in:
Greg Fitzgerald 2019-02-22 00:37:28 -07:00
parent 3a7008949f
commit 2d03ae2fae
1 changed files with 21 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/fullnode.rs
View File

@ -405,7 +405,7 @@ impl Service for Fullnode {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::blocktree::{create_tmp_sample_ledger, tmp_copy_ledger, DEFAULT_SLOT_HEIGHT}; use crate::blocktree::{create_tmp_sample_blocktree, tmp_copy_ledger, DEFAULT_SLOT_HEIGHT};
use crate::entry::make_consecutive_blobs; use crate::entry::make_consecutive_blobs;
use crate::leader_scheduler::make_active_set_entries; use crate::leader_scheduler::make_active_set_entries;
use crate::streamer::responder; use crate::streamer::responder;
@ -420,21 +420,10 @@ mod tests {
let validator_keypair = Keypair::new(); let validator_keypair = Keypair::new();
let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey()); let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey());
let ( let (genesis_block, _mint_keypair) =
_mint_keypair, GenesisBlock::new_with_leader(10_000, leader_keypair.pubkey(), 1000);
validator_ledger_path, let (validator_ledger_path, _tick_height, _last_entry_height, _last_id, _last_entry_id) =
_tick_height, create_tmp_sample_blocktree("validator_exit", &genesis_block, 0);
_last_entry_height,
_last_id,
_last_entry_id,
) = create_tmp_sample_ledger(
"validator_exit",
10_000,
0,
leader_keypair.pubkey(),
1000,
DEFAULT_TICKS_PER_SLOT,
);
let validator = Fullnode::new( let validator = Fullnode::new(
validator_node, validator_node,
@ -458,20 +447,18 @@ mod tests {
.map(|i| { .map(|i| {
let validator_keypair = Keypair::new(); let validator_keypair = Keypair::new();
let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey()); let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey());
let (genesis_block, _mint_keypair) =
GenesisBlock::new_with_leader(10_000, leader_keypair.pubkey(), 1000);
let ( let (
_mint_keypair,
validator_ledger_path, validator_ledger_path,
_tick_height, _tick_height,
_last_entry_height, _last_entry_height,
_last_id, _last_id,
_last_entry_id, _last_entry_id,
) = create_tmp_sample_ledger( ) = create_tmp_sample_blocktree(
&format!("validator_parallel_exit_{}", i), &format!("validator_parallel_exit_{}", i),
10_000, &genesis_block,
0, 0,
leader_keypair.pubkey(),
1000,
DEFAULT_TICKS_PER_SLOT,
); );
ledger_paths.push(validator_ledger_path.clone()); ledger_paths.push(validator_ledger_path.clone());
Fullnode::new( Fullnode::new(
@ -519,21 +506,17 @@ mod tests {
let mut fullnode_config = FullnodeConfig::default(); let mut fullnode_config = FullnodeConfig::default();
fullnode_config.leader_scheduler_config = leader_scheduler_config; fullnode_config.leader_scheduler_config = leader_scheduler_config;
let (mut genesis_block, _mint_keypair) =
GenesisBlock::new_with_leader(10_000, bootstrap_leader_keypair.pubkey(), 500);
genesis_block.ticks_per_slot = fullnode_config.ticks_per_slot();
let ( let (
_mint_keypair,
bootstrap_leader_ledger_path, bootstrap_leader_ledger_path,
_tick_height, _tick_height,
_genesis_entry_height, _genesis_entry_height,
_last_id, _last_id,
_last_entry_id, _last_entry_id,
) = create_tmp_sample_ledger( ) = create_tmp_sample_blocktree("test_leader_to_leader_transition", &genesis_block, 1);
"test_leader_to_leader_transition",
10_000,
1,
bootstrap_leader_keypair.pubkey(),
500,
fullnode_config.ticks_per_slot(),
);
// Start the bootstrap leader // Start the bootstrap leader
let bootstrap_leader = Fullnode::new( let bootstrap_leader = Fullnode::new(
@ -754,15 +737,13 @@ mod tests {
// Create validator identity // Create validator identity
assert!(num_genesis_ticks <= ticks_per_slot); assert!(num_genesis_ticks <= ticks_per_slot);
let (mint_keypair, ledger_path, tick_height, mut entry_height, last_id, last_entry_id) =
create_tmp_sample_ledger( let (mut genesis_block, mint_keypair) =
test_name, GenesisBlock::new_with_leader(10_000, leader_node.info.id, 500);
10_000, genesis_block.ticks_per_slot = ticks_per_slot;
num_genesis_ticks,
leader_node.info.id, let (ledger_path, tick_height, mut entry_height, last_id, last_entry_id) =
500, create_tmp_sample_blocktree(test_name, &genesis_block, num_genesis_ticks);
ticks_per_slot,
);
let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey()); let validator_node = Node::new_localhost_with_pubkey(validator_keypair.pubkey());