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

Rename to is_valid instead of is_invalid (#19670)

Browse Source
This commit is contained in:
Brooks Prumo
2021-09-07 09:31:54 -05:00
committed by GitHub
parent b14aa4e14d
commit fe8ba81ce6
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/validator.rs
View File

@ -636,7 +636,7 @@ impl Validator {
let (snapshot_packager_service, snapshot_config_and_pending_package) = let (snapshot_packager_service, snapshot_config_and_pending_package) =
if let Some(snapshot_config) = config.snapshot_config.clone() { if let Some(snapshot_config) = config.snapshot_config.clone() {
if is_snapshot_config_invalid( if !is_snapshot_config_valid(
snapshot_config.full_snapshot_archive_interval_slots, snapshot_config.full_snapshot_archive_interval_slots,
config.accounts_hash_interval_slots, config.accounts_hash_interval_slots,
) { ) {
@ -1650,13 +1650,13 @@ fn cleanup_accounts_path(account_path: &std::path::Path) {
} }
} }
pub fn is_snapshot_config_invalid( pub fn is_snapshot_config_valid(
snapshot_interval_slots: u64, snapshot_interval_slots: u64,
accounts_hash_interval_slots: u64, accounts_hash_interval_slots: u64,
) -> bool { ) -> bool {
snapshot_interval_slots != 0 snapshot_interval_slots == 0
&& (snapshot_interval_slots < accounts_hash_interval_slots || (snapshot_interval_slots >= accounts_hash_interval_slots
|| snapshot_interval_slots % accounts_hash_interval_slots != 0) && snapshot_interval_slots % accounts_hash_interval_slots == 0)
} }
#[cfg(test)] #[cfg(test)]
@ -1861,11 +1861,11 @@ mod tests {
#[test] #[test]
fn test_interval_check() { fn test_interval_check() {
assert!(!is_snapshot_config_invalid(0, 100)); assert!(is_snapshot_config_valid(0, 100));
assert!(is_snapshot_config_invalid(1, 100)); assert!(!is_snapshot_config_valid(1, 100));
assert!(is_snapshot_config_invalid(230, 100)); assert!(!is_snapshot_config_valid(230, 100));
assert!(!is_snapshot_config_invalid(500, 100)); assert!(is_snapshot_config_valid(500, 100));
assert!(!is_snapshot_config_invalid(5, 5)); assert!(is_snapshot_config_valid(5, 5));
} }
#[test] #[test]

6
validator/src/main.rs
View File

@ -23,9 +23,7 @@ use {
ledger_cleanup_service::{DEFAULT_MAX_LEDGER_SHREDS, DEFAULT_MIN_MAX_LEDGER_SHREDS}, ledger_cleanup_service::{DEFAULT_MAX_LEDGER_SHREDS, DEFAULT_MIN_MAX_LEDGER_SHREDS},
tower_storage, tower_storage,
tpu::DEFAULT_TPU_COALESCE_MS, tpu::DEFAULT_TPU_COALESCE_MS,
validator::{ validator::{is_snapshot_config_valid, Validator, ValidatorConfig, ValidatorStartProgress},
is_snapshot_config_invalid, Validator, ValidatorConfig, ValidatorStartProgress,
},
}, },
solana_download_utils::{download_snapshot, DownloadProgressRecord}, solana_download_utils::{download_snapshot, DownloadProgressRecord},
solana_genesis_utils::download_then_check_genesis_hash, solana_genesis_utils::download_then_check_genesis_hash,
@ -2703,7 +2701,7 @@ pub fn main() {
eprintln!("Accounts hash interval should not be 0."); eprintln!("Accounts hash interval should not be 0.");
exit(1); exit(1);
} }
if is_snapshot_config_invalid( if !is_snapshot_config_valid(
snapshot_interval_slots, snapshot_interval_slots,
validator_config.accounts_hash_interval_slots, validator_config.accounts_hash_interval_slots,
) { ) {