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

Remove duplicate SnapshotConfig validation code (#32290) 

Instead, use the is_snapshot_config_valid() helper function.
This commit is contained in:
steviez 2023-06-27 13:54:55 -05:00 committed by GitHub
parent ee6684b2eb
commit 0264d50ebf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
local-cluster/tests/common/mod.rs
View File

@ -4,7 +4,7 @@ use {
solana_core::{
consensus::{Tower, SWITCH_FORK_THRESHOLD},
tower_storage::FileTowerStorage,
validator::ValidatorConfig,
validator::{is_snapshot_config_valid, ValidatorConfig},
},
solana_gossip::gossip_service::discover_cluster,
solana_ledger::{
@ -478,20 +478,12 @@ impl SnapshotValidatorConfig {
accounts_hash_interval_slots: Slot,
num_account_paths: usize,
) -> SnapshotValidatorConfig {
// Interval values must be nonzero
assert!(accounts_hash_interval_slots > 0);
assert!(full_snapshot_archive_interval_slots > 0);
assert!(incremental_snapshot_archive_interval_slots > 0);
// Ensure that some snapshots will be created
assert!(full_snapshot_archive_interval_slots != DISABLED_SNAPSHOT_ARCHIVE_INTERVAL);
assert!(full_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0);
if incremental_snapshot_archive_interval_slots != DISABLED_SNAPSHOT_ARCHIVE_INTERVAL {
assert!(incremental_snapshot_archive_interval_slots > 0);
assert!(
incremental_snapshot_archive_interval_slots % accounts_hash_interval_slots == 0
);
assert!(
full_snapshot_archive_interval_slots % incremental_snapshot_archive_interval_slots
== 0
);
}
// Create the snapshot config
let _ = fs::create_dir_all(farf_dir());
@ -510,6 +502,10 @@ impl SnapshotValidatorConfig {
maximum_incremental_snapshot_archives_to_retain: NonZeroUsize::new(usize::MAX).unwrap(),
..SnapshotConfig::default()
};
assert!(is_snapshot_config_valid(
&snapshot_config,
accounts_hash_interval_slots
));
// Create the account paths
let (account_storage_dirs, account_storage_paths) =