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

Minor cleanup on some snapshot related tests (#33485)

This commit is contained in:
steviez 2023-10-02 20:25:30 +02:00 committed by GitHub
parent 73e9e6dd70
commit 3eae980293
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/snapshot_packager_service.rs
View File

@ -264,7 +264,7 @@ mod tests {
let bank_snapshot_info = let bank_snapshot_info =
snapshot_utils::get_highest_bank_snapshot(&bank_snapshots_dir).unwrap(); snapshot_utils::get_highest_bank_snapshot(&bank_snapshots_dir).unwrap();
let snapshot_storages = bank.get_snapshot_storages(None); let snapshot_storages = bank.get_snapshot_storages(None);
let archive_format = ArchiveFormat::TarBzip2; let archive_format = ArchiveFormat::Tar;
let full_archive = snapshot_bank_utils::package_and_archive_full_snapshot( let full_archive = snapshot_bank_utils::package_and_archive_full_snapshot(
&bank, &bank,

2
download-utils/src/lib.rs
View File

@ -288,7 +288,7 @@ pub fn download_snapshot_archive(
ArchiveFormat::TarGzip, ArchiveFormat::TarGzip,
ArchiveFormat::TarBzip2, ArchiveFormat::TarBzip2,
ArchiveFormat::TarLz4, ArchiveFormat::TarLz4,
ArchiveFormat::Tar, // `solana-test-validator` creates uncompressed snapshots ArchiveFormat::Tar,
] { ] {
let destination_path = match snapshot_kind { let destination_path = match snapshot_kind {
SnapshotKind::FullSnapshot => snapshot_utils::build_full_snapshot_archive_path( SnapshotKind::FullSnapshot => snapshot_utils::build_full_snapshot_archive_path(

4
rpc/src/rpc_service.rs
View File

@ -745,7 +745,9 @@ mod tests {
assert!(!rrm.is_file_get_path("//genesis.tar.bz2")); assert!(!rrm.is_file_get_path("//genesis.tar.bz2"));
assert!(!rrm.is_file_get_path("/../genesis.tar.bz2")); assert!(!rrm.is_file_get_path("/../genesis.tar.bz2"));
assert!(!rrm.is_file_get_path("/snapshot.tar.bz2")); // This is a redirect // These two are redirects
assert!(!rrm.is_file_get_path("/snapshot.tar.bz2"));
assert!(!rrm.is_file_get_path("/incremental-snapshot.tar.bz2"));
assert!(!rrm.is_file_get_path( assert!(!rrm.is_file_get_path(
"/snapshot-100-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2" "/snapshot-100-AvFf9oS8A8U78HdjT9YG2sTTThLHJZmhaMn2g8vkWYnr.tar.bz2"

2
runtime/src/bank/serde_snapshot.rs
View File

@ -474,7 +474,7 @@ mod tests {
None, None,
full_snapshot_archives_dir.path(), full_snapshot_archives_dir.path(),
incremental_snapshot_archives_dir.path(), incremental_snapshot_archives_dir.path(),
ArchiveFormat::TarBzip2, ArchiveFormat::Tar,
NonZeroUsize::new(1).unwrap(), NonZeroUsize::new(1).unwrap(),
NonZeroUsize::new(1).unwrap(), NonZeroUsize::new(1).unwrap(),
) )

2
runtime/src/snapshot_bank_utils.rs
View File

@ -1408,7 +1408,7 @@ mod tests {
let bank_snapshots_dir = tempfile::TempDir::new().unwrap(); let bank_snapshots_dir = tempfile::TempDir::new().unwrap();
let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap(); let full_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap(); let incremental_snapshot_archives_dir = tempfile::TempDir::new().unwrap();
let snapshot_archive_format = ArchiveFormat::TarGzip; let snapshot_archive_format = ArchiveFormat::Tar;
let full_snapshot_archive_info = bank_to_full_snapshot_archive( let full_snapshot_archive_info = bank_to_full_snapshot_archive(
bank_snapshots_dir.path(), bank_snapshots_dir.path(),