From 181fffb9164b867fe0116940a22a500fc0d9020e Mon Sep 17 00:00:00 2001 From: HaoranYi Date: Mon, 7 Mar 2022 11:34:35 -0600 Subject: [PATCH] rename status filename to be consistent (#23501) --- core/src/snapshot_packager_service.rs | 4 ++-- core/tests/snapshots.rs | 2 +- runtime/src/snapshot_utils.rs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/snapshot_packager_service.rs b/core/src/snapshot_packager_service.rs index 6460dcca2c..5b49723470 100644 --- a/core/src/snapshot_packager_service.rs +++ b/core/src/snapshot_packager_service.rs @@ -219,7 +219,7 @@ mod tests { snapshot_archive_info::SnapshotArchiveInfo, snapshot_package::{SnapshotPackage, SnapshotType}, snapshot_utils::{ - self, ArchiveFormat, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILE_NAME, + self, ArchiveFormat, SnapshotVersion, SNAPSHOT_STATUS_CACHE_FILENAME, }, }, solana_sdk::hash::Hash, @@ -335,7 +335,7 @@ mod tests { // the source dir for snapshots let dummy_slot_deltas: Vec = vec![]; snapshot_utils::serialize_snapshot_data_file( - &snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILE_NAME), + &snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILENAME), |stream| { serialize_into(stream, &dummy_slot_deltas)?; Ok(()) diff --git a/core/tests/snapshots.rs b/core/tests/snapshots.rs index 9f9af147ff..0787e40539 100644 --- a/core/tests/snapshots.rs +++ b/core/tests/snapshots.rs @@ -544,7 +544,7 @@ mod tests { snapshot_utils::serialize_snapshot_data_file( &saved_snapshots_dir .path() - .join(snapshot_utils::SNAPSHOT_STATUS_CACHE_FILE_NAME), + .join(snapshot_utils::SNAPSHOT_STATUS_CACHE_FILENAME), |stream| { serialize_into(stream, &[] as &[BankSlotDelta])?; Ok(()) diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs index 76af3daf5a..bde1e6ba58 100644 --- a/runtime/src/snapshot_utils.rs +++ b/runtime/src/snapshot_utils.rs @@ -43,7 +43,7 @@ use { thiserror::Error, }; -pub const SNAPSHOT_STATUS_CACHE_FILE_NAME: &str = "status_cache"; +pub const SNAPSHOT_STATUS_CACHE_FILENAME: &str = "status_cache"; pub const DEFAULT_FULL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 25_000; pub const DEFAULT_INCREMENTAL_SNAPSHOT_ARCHIVE_INTERVAL_SLOTS: Slot = 100; const MAX_SNAPSHOT_DATA_FILE_SIZE: u64 = 32 * 1024 * 1024 * 1024; // 32 GiB @@ -258,7 +258,7 @@ pub fn archive_snapshot_package( &snapshot_package .snapshot_links .path() - .join(SNAPSHOT_STATUS_CACHE_FILE_NAME), + .join(SNAPSHOT_STATUS_CACHE_FILENAME), )?; let mut timer = Measure::start("snapshot_package-package_snapshots"); @@ -1508,7 +1508,7 @@ fn rebuild_bank_from_snapshots( .as_path() }, ) - .join(SNAPSHOT_STATUS_CACHE_FILE_NAME); + .join(SNAPSHOT_STATUS_CACHE_FILENAME); let slot_deltas = deserialize_snapshot_data_file(&status_cache_path, |stream| { info!( "Rebuilding status cache from {}",