gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Lock snapshot version to 0.23.2 (#8167)

Browse Source 
automerge
This commit is contained in:
Michael Vines
2020-02-07 12:35:54 -07:00
committed by GitHub
parent 9c5ef19d80
commit de752eaf80
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ledger/src/snapshot_utils.rs
View File

@ -26,6 +26,8 @@ pub const TAR_SNAPSHOTS_DIR: &str = "snapshots";
pub const TAR_ACCOUNTS_DIR: &str = "accounts"; pub const TAR_ACCOUNTS_DIR: &str = "accounts";
pub const TAR_VERSION_FILE: &str = "version"; pub const TAR_VERSION_FILE: &str = "version";
pub const SNAPSHOT_VERSION: &str = "0.23.2"; // format!("{}\n", env!("CARGO_PKG_VERSION"));
#[derive(PartialEq, Ord, Eq, Debug)] #[derive(PartialEq, Ord, Eq, Debug)]
pub struct SlotSnapshotPaths { pub struct SlotSnapshotPaths {
pub slot: Slot, pub slot: Slot,
@ -168,10 +170,8 @@ pub fn archive_snapshot_package(snapshot_package: &SnapshotPackage) -> Result<()
// Write version file // Write version file
{ {
let snapshot_version = format!("{}\n", env!("CARGO_PKG_VERSION"));
let mut f = std::fs::File::create(staging_version_file)?; let mut f = std::fs::File::create(staging_version_file)?;
//f.write_all(&snapshot_version.to_string().into_bytes())?; f.write_all(&SNAPSHOT_VERSION.to_string().into_bytes())?;
f.write_all(&snapshot_version.into_bytes())?;
} }
// Tar the staging directory into the archive at `archive_path` // Tar the staging directory into the archive at `archive_path`
@ -524,7 +524,7 @@ where
MAX_SNAPSHOT_DATA_FILE_SIZE, MAX_SNAPSHOT_DATA_FILE_SIZE,
|stream| { |stream| {
let mut bank: Bank = match snapshot_version { let mut bank: Bank = match snapshot_version {
env!("CARGO_PKG_VERSION") => deserialize_from_snapshot(stream.by_ref())?, SNAPSHOT_VERSION => deserialize_from_snapshot(stream.by_ref())?,
_ => { _ => {
return Err(get_io_error(&format!( return Err(get_io_error(&format!(
"unsupported snapshot version: {}", "unsupported snapshot version: {}",