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

Reduce new_banks_from_ledger arguments

Browse Source
This commit is contained in:
Michael Vines
2022-03-07 21:04:36 +01:00
parent 115f376465
commit 543d5d4a5d
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/validator.rs
View File

@ -481,11 +481,8 @@ impl Validator {
vote_account, vote_account,
config, config,
ledger_path, ledger_path,
config.poh_verify,
&exit, &exit,
config.enforce_ulimit_nofile,
&start_progress, &start_progress,
config.no_poh_speed_test,
accounts_package_channel.0.clone(), accounts_package_channel.0.clone(),
accounts_update_notifier, accounts_update_notifier,
transaction_notifier, transaction_notifier,
@ -1197,17 +1194,14 @@ fn post_process_restored_tower(
}) })
} }
#[allow(clippy::type_complexity, clippy::too_many_arguments)] #[allow(clippy::type_complexity)]
fn new_banks_from_ledger( fn new_banks_from_ledger(
validator_identity: &Pubkey, validator_identity: &Pubkey,
vote_account: &Pubkey, vote_account: &Pubkey,
config: &ValidatorConfig, config: &ValidatorConfig,
ledger_path: &Path, ledger_path: &Path,
poh_verify: bool,
exit: &Arc<AtomicBool>, exit: &Arc<AtomicBool>,
enforce_ulimit_nofile: bool,
start_progress: &Arc<RwLock<ValidatorStartProgress>>, start_progress: &Arc<RwLock<ValidatorStartProgress>>,
no_poh_speed_test: bool,
accounts_package_sender: AccountsPackageSender, accounts_package_sender: AccountsPackageSender,
accounts_update_notifier: Option<AccountsUpdateNotifier>, accounts_update_notifier: Option<AccountsUpdateNotifier>,
transaction_notifier: Option<TransactionNotifierLock>, transaction_notifier: Option<TransactionNotifierLock>,
@ -1245,7 +1239,7 @@ fn new_banks_from_ledger(
} }
} }
if !no_poh_speed_test { if !config.no_poh_speed_test {
check_poh_speed(&genesis_config, None); check_poh_speed(&genesis_config, None);
} }
@ -1258,7 +1252,6 @@ fn new_banks_from_ledger(
ledger_path, ledger_path,
BlockstoreOptions { BlockstoreOptions {
recovery_mode: config.wal_recovery_mode.clone(), recovery_mode: config.wal_recovery_mode.clone(),
enforce_ulimit_nofile,
advanced_options: config.blockstore_advanced_options.clone(), advanced_options: config.blockstore_advanced_options.clone(),
..BlockstoreOptions::default() ..BlockstoreOptions::default()
}, },
@ -1293,7 +1286,7 @@ fn new_banks_from_ledger(
let process_options = blockstore_processor::ProcessOptions { let process_options = blockstore_processor::ProcessOptions {
bpf_jit: config.bpf_jit, bpf_jit: config.bpf_jit,
poh_verify, poh_verify: config.poh_verify,
dev_halt_at_slot: config.dev_halt_at_slot, dev_halt_at_slot: config.dev_halt_at_slot,
new_hard_forks: config.new_hard_forks.clone(), new_hard_forks: config.new_hard_forks.clone(),
debug_keys: config.debug_keys.clone(), debug_keys: config.debug_keys.clone(),