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

Removes bank_snapshots_dir param from bank_fields_from_snapshot_archives() (#31349)

This commit is contained in:
Brooks 2023-04-26 11:45:00 -04:00 committed by GitHub
parent c658d4e737
commit 18aa54a4b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
runtime/src/snapshot_utils.rs
View File

@ -1404,7 +1404,6 @@ fn verify_and_unarchive_snapshots(
/// Utility for parsing out bank specific information from a snapshot archive. This utility can be used /// Utility for parsing out bank specific information from a snapshot archive. This utility can be used
/// to parse out bank specific information like the leader schedule, epoch schedule, etc. /// to parse out bank specific information like the leader schedule, epoch schedule, etc.
pub fn bank_fields_from_snapshot_archives( pub fn bank_fields_from_snapshot_archives(
bank_snapshots_dir: impl AsRef<Path>,
full_snapshot_archives_dir: impl AsRef<Path>, full_snapshot_archives_dir: impl AsRef<Path>,
incremental_snapshot_archives_dir: impl AsRef<Path>, incremental_snapshot_archives_dir: impl AsRef<Path>,
) -> Result<BankFieldsToDeserialize> { ) -> Result<BankFieldsToDeserialize> {
@ -1417,15 +1416,14 @@ pub fn bank_fields_from_snapshot_archives(
full_snapshot_archive_info.slot(), full_snapshot_archive_info.slot(),
); );
let temp_dir = tempfile::Builder::new() let temp_unpack_dir = TempDir::new()?;
.prefix("dummy-accounts-path") let temp_accounts_dir = TempDir::new()?;
.tempdir()?;
let account_paths = vec![temp_dir.path().to_path_buf()]; let account_paths = vec![temp_accounts_dir.path().to_path_buf()];
let (unarchived_full_snapshot, unarchived_incremental_snapshot, _next_append_vec_id) = let (unarchived_full_snapshot, unarchived_incremental_snapshot, _next_append_vec_id) =
verify_and_unarchive_snapshots( verify_and_unarchive_snapshots(
&bank_snapshots_dir, &temp_unpack_dir,
&full_snapshot_archive_info, &full_snapshot_archive_info,
incremental_snapshot_archive_info.as_ref(), incremental_snapshot_archive_info.as_ref(),
&account_paths, &account_paths,
@ -4934,12 +4932,8 @@ mod tests {
) )
.unwrap(); .unwrap();
let bank_fields = bank_fields_from_snapshot_archives( let bank_fields =
&all_snapshots_dir, bank_fields_from_snapshot_archives(&all_snapshots_dir, &all_snapshots_dir).unwrap();
&all_snapshots_dir,
&all_snapshots_dir,
)
.unwrap();
assert_eq!(bank_fields.slot, bank2.slot()); assert_eq!(bank_fields.slot, bank2.slot());
assert_eq!(bank_fields.parent_slot, bank2.parent_slot()); assert_eq!(bank_fields.parent_slot, bank2.parent_slot());
} }