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

Uninteresting cleanup (#7938)

Browse Source 
automerge
This commit is contained in:
mergify[bot]
2020-01-22 21:16:25 -08:00
committed by Grimes
parent 28f81bd0a3
commit 5aa8ee8ede
1 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/validator.rs
View File

@ -20,6 +20,7 @@ use crate::{
tvu::{Sockets, Tvu}, tvu::{Sockets, Tvu},
}; };
use crossbeam_channel::unbounded; use crossbeam_channel::unbounded;
use solana_ledger::shred::Shred;
use solana_ledger::{ use solana_ledger::{
bank_forks::{BankForks, SnapshotConfig}, bank_forks::{BankForks, SnapshotConfig},
bank_forks_utils, bank_forks_utils,
@ -30,6 +31,7 @@ use solana_ledger::{
leader_schedule_cache::LeaderScheduleCache, leader_schedule_cache::LeaderScheduleCache,
}; };
use solana_metrics::datapoint_info; use solana_metrics::datapoint_info;
use solana_runtime::bank::Bank;
use solana_sdk::{ use solana_sdk::{
clock::{Slot, DEFAULT_SLOTS_PER_TURN}, clock::{Slot, DEFAULT_SLOTS_PER_TURN},
genesis_config::GenesisConfig, genesis_config::GenesisConfig,
@ -39,8 +41,6 @@ use solana_sdk::{
signature::{Keypair, KeypairUtil}, signature::{Keypair, KeypairUtil},
timing::timestamp, timing::timestamp,
}; };
use solana_ledger::shred::Shred;
use std::{ use std::{
net::{IpAddr, Ipv4Addr, SocketAddr}, net::{IpAddr, Ipv4Addr, SocketAddr},
path::{Path, PathBuf}, path::{Path, PathBuf},
@ -162,11 +162,8 @@ impl Validator {
) = new_banks_from_blockstore( ) = new_banks_from_blockstore(
config.expected_genesis_hash, config.expected_genesis_hash,
ledger_path, ledger_path,
config.account_paths.clone(),
config.snapshot_config.clone(),
poh_verify, poh_verify,
config.dev_halt_at_slot, config,
config.fixed_leader_schedule.clone(),
); );
let leader_schedule_cache = Arc::new(leader_schedule_cache); let leader_schedule_cache = Arc::new(leader_schedule_cache);
@ -472,11 +469,8 @@ impl Validator {
pub fn new_banks_from_blockstore( pub fn new_banks_from_blockstore(
expected_genesis_hash: Option<Hash>, expected_genesis_hash: Option<Hash>,
blockstore_path: &Path, blockstore_path: &Path,
account_paths: Vec<PathBuf>,
snapshot_config: Option<SnapshotConfig>,
poh_verify: bool, poh_verify: bool,
dev_halt_at_slot: Option<Slot>, config: &ValidatorConfig,
fixed_leader_schedule: Option<FixedSchedule>,
) -> ( ) -> (
Hash, Hash,
BankForks, BankForks,
@ -510,15 +504,15 @@ pub fn new_banks_from_blockstore(
let process_options = blockstore_processor::ProcessOptions { let process_options = blockstore_processor::ProcessOptions {
poh_verify, poh_verify,
dev_halt_at_slot, dev_halt_at_slot: config.dev_halt_at_slot,
..blockstore_processor::ProcessOptions::default() ..blockstore_processor::ProcessOptions::default()
}; };
let (mut bank_forks, bank_forks_info, mut leader_schedule_cache) = bank_forks_utils::load( let (mut bank_forks, bank_forks_info, mut leader_schedule_cache) = bank_forks_utils::load(
&genesis_config, &genesis_config,
&blockstore, &blockstore,
account_paths, config.account_paths.clone(),
snapshot_config.as_ref(), config.snapshot_config.as_ref(),
process_options, process_options,
) )
.unwrap_or_else(|err| { .unwrap_or_else(|err| {
@ -526,9 +520,9 @@ pub fn new_banks_from_blockstore(
std::process::exit(1); std::process::exit(1);
}); });
leader_schedule_cache.set_fixed_leader_schedule(fixed_leader_schedule); leader_schedule_cache.set_fixed_leader_schedule(config.fixed_leader_schedule.clone());
bank_forks.set_snapshot_config(snapshot_config); bank_forks.set_snapshot_config(config.snapshot_config.clone());
( (
genesis_hash, genesis_hash,
@ -607,10 +601,7 @@ fn report_target_features() {
} }
// Get the activated stake percentage (based on the provided bank) that is visible in gossip // Get the activated stake percentage (based on the provided bank) that is visible in gossip
fn get_stake_percent_in_gossip( fn get_stake_percent_in_gossip(bank: &Arc<Bank>, cluster_info: &Arc<RwLock<ClusterInfo>>) -> u64 {
bank: &Arc<solana_runtime::bank::Bank>,
cluster_info: &Arc<RwLock<ClusterInfo>>,
) -> u64 {
let mut gossip_stake = 0; let mut gossip_stake = 0;
let mut total_activated_stake = 0; let mut total_activated_stake = 0;
let tvu_peers = cluster_info.read().unwrap().tvu_peers(); let tvu_peers = cluster_info.read().unwrap().tvu_peers();