Skip to content

Updates snapshot tests to use default archive format #6319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brooksprumo merged 1 commit into from
May 27, 2025
Merged

Updates snapshot tests to use default archive format #6319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions runtime/src/bank/serde_snapshot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ mod tests {
SerdeAccountsHash, SerdeIncrementalAccountsHash, SnapshotStreams,
},
snapshot_bank_utils,
snapshot_config::SnapshotConfig,
snapshot_utils::{
create_tmp_accounts_dir_for_tests, get_storages_to_serialize, ArchiveFormat,
create_tmp_accounts_dir_for_tests, get_storages_to_serialize,
StorageAndNextAccountsFileId,
},
stakes::{SerdeStakesToStakeFormat, Stakes, StakesEnum},
Expand Down Expand Up @@ -408,7 +409,7 @@ mod tests {
None,
full_snapshot_archives_dir.path(),
incremental_snapshot_archives_dir.path(),
ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
)
.unwrap();

Expand Down
6 changes: 4 additions & 2 deletions runtime/src/bank/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ use {
create_genesis_config_with_leader, create_genesis_config_with_vote_accounts,
genesis_sysvar_and_builtin_program_lamports, GenesisConfigInfo, ValidatorVoteKeypairs,
},
snapshot_bank_utils, snapshot_utils,
snapshot_bank_utils,
snapshot_config::SnapshotConfig,
snapshot_utils,
stake_history::StakeHistory,
stakes::InvalidCacheEntryReason,
status_cache::MAX_CACHE_ENTRIES,
Expand Down Expand Up @@ -12956,7 +12958,7 @@ fn test_rebuild_skipped_rewrites() {
None,
full_snapshot_archives_dir.path(),
incremental_snapshot_archives_dir.path(),
snapshot_utils::ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
)
.unwrap();

Expand Down
27 changes: 13 additions & 14 deletions runtime/src/snapshot_bank_utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,9 +1106,8 @@ mod tests {
purge_all_bank_snapshots, purge_bank_snapshot,
purge_bank_snapshots_older_than_slot, purge_incomplete_bank_snapshots,
purge_old_bank_snapshots, purge_old_bank_snapshots_at_startup,
snapshot_storage_rebuilder::get_slot_and_append_vec_id, ArchiveFormat,
BankSnapshotKind, BANK_SNAPSHOT_PRE_FILENAME_EXTENSION,
SNAPSHOT_FULL_SNAPSHOT_SLOT_FILENAME,
snapshot_storage_rebuilder::get_slot_and_append_vec_id, BankSnapshotKind,
BANK_SNAPSHOT_PRE_FILENAME_EXTENSION, SNAPSHOT_FULL_SNAPSHOT_SLOT_FILENAME,
},
status_cache::Status,
},
Expand Down Expand Up @@ -1156,7 +1155,7 @@ mod tests {
SnapshotVersion::default(),
&snapshot_archives_dir,
&snapshot_archives_dir,
ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
should_flush_and_hard_link_storages,
)
.unwrap();
Expand Down Expand Up @@ -1202,7 +1201,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let snapshot_archive_info = bank_to_full_snapshot_archive(
&bank_snapshots_dir,
Expand Down Expand Up @@ -1314,7 +1313,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let full_snapshot_archive_info = bank_to_full_snapshot_archive(
bank_snapshots_dir.path(),
Expand Down Expand Up @@ -1402,7 +1401,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let full_snapshot_slot = slot;
let full_snapshot_archive_info = bank_to_full_snapshot_archive(
Expand Down Expand Up @@ -1522,7 +1521,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let full_snapshot_slot = slot;
bank_to_full_snapshot_archive(
Expand Down Expand Up @@ -1631,7 +1630,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let (mut genesis_config, mint_keypair) = create_genesis_config(sol_to_lamports(1_000_000.));
// test expects 0 transaction fee
Expand Down Expand Up @@ -1828,7 +1827,7 @@ mod tests {
}

let all_snapshots_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let full_snapshot_slot = slot;
bank_to_full_snapshot_archive(
Expand Down Expand Up @@ -1885,7 +1884,7 @@ mod tests {
SnapshotVersion::default(),
&snapshot_archives_dir,
&snapshot_archives_dir,
ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
true,
)
.unwrap();
Expand Down Expand Up @@ -2123,7 +2122,7 @@ mod tests {
None,
&full_snapshot_archives_dir,
&incremental_snapshot_archives_dir,
ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
)
.unwrap();
let full_accounts_hash = bank
Expand Down Expand Up @@ -2153,7 +2152,7 @@ mod tests {
None,
&full_snapshot_archives_dir,
&incremental_snapshot_archives_dir,
ArchiveFormat::Tar,
SnapshotConfig::default().archive_format,
)
.unwrap();
let incremental_accounts_hash = bank
Expand Down Expand Up @@ -2252,7 +2251,7 @@ mod tests {

let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::Tar;
let snapshot_archive_format = SnapshotConfig::default().archive_format;

let (genesis_config, mint_keypair) = create_genesis_config(sol_to_lamports(1_000_000.));

Expand Down
Loading