From 3bc9789e8dd8852556ccf098f455b487b534b479 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 30 Jan 2020 21:57:48 -0700 Subject: [PATCH] Remove support for 0.22.3 snapshots --- ledger/src/snapshot_utils.rs | 5 -- runtime/src/bank.rs | 116 ----------------------------------- 2 files changed, 121 deletions(-) diff --git a/ledger/src/snapshot_utils.rs b/ledger/src/snapshot_utils.rs index 3276c1d33a..9b38051b35 100644 --- a/ledger/src/snapshot_utils.rs +++ b/ledger/src/snapshot_utils.rs @@ -525,11 +525,6 @@ where |stream| { let mut bank: Bank = match snapshot_version { env!("CARGO_PKG_VERSION") => deserialize_from_snapshot(stream.by_ref())?, - "0.22.3" => { - let bank0223: solana_runtime::bank::LegacyBank0223 = - deserialize_from_snapshot(stream.by_ref())?; - bank0223.into() - } _ => { return Err(get_io_error(&format!( "unsupported snapshot version: {}", diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 9b74fce242..e8da6e7144 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -2068,122 +2068,6 @@ where .deserialize_from(reader) } -// The `bank` struct as defined in Solana v0.22.3 -#[derive(Default, Deserialize, Serialize)] -pub struct LegacyBank0223 { - #[serde(skip)] - pub rc: BankRc, - - #[serde(skip)] - pub src: StatusCacheRc, - - pub blockhash_queue: RwLock, - pub ancestors: HashMap, - pub hash: RwLock, - pub parent_hash: Hash, - pub parent_slot: Slot, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub transaction_count: AtomicU64, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub tick_height: AtomicU64, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub signature_count: AtomicU64, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub capitalization: AtomicU64, - - pub max_tick_height: u64, - pub hashes_per_tick: Option, - pub ticks_per_slot: u64, - pub ns_per_slot: u128, - pub genesis_creation_time: UnixTimestamp, - pub slots_per_year: f64, - pub slots_per_segment: u64, - pub slot: Slot, - pub epoch: Epoch, - pub block_height: u64, - pub collector_id: Pubkey, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub collector_fees: AtomicU64, - - pub fee_calculator: FeeCalculator, - - #[serde(serialize_with = "serialize_atomicu64")] - #[serde(deserialize_with = "deserialize_atomicu64")] - pub collected_rent: AtomicU64, - - pub rent_collector: RentCollector, - pub epoch_schedule: EpochSchedule, - pub inflation: Arc>, - pub stakes: RwLock, - pub storage_accounts: RwLock, - pub epoch_stakes: HashMap, - - #[serde(serialize_with = "serialize_atomicbool")] - #[serde(deserialize_with = "deserialize_atomicbool")] - pub is_delta: AtomicBool, - - pub message_processor: MessageProcessor, - - #[serde(skip)] - pub entered_epoch_callback: Arc>>, - - #[serde(skip)] - pub last_vote_sync: AtomicU64, -} - -impl From for Bank { - fn from(bank: LegacyBank0223) -> Self { - Bank { - rc: bank.rc, - src: bank.src, - slot: bank.slot, - epoch: bank.epoch, - blockhash_queue: bank.blockhash_queue, - hashes_per_tick: bank.hashes_per_tick, - ticks_per_slot: bank.ticks_per_slot, - ns_per_slot: bank.ns_per_slot, - genesis_creation_time: bank.genesis_creation_time, - slots_per_segment: bank.slots_per_segment, - slots_per_year: bank.slots_per_year, - epoch_schedule: bank.epoch_schedule, - collected_rent: bank.collected_rent, - rent_collector: bank.rent_collector, - max_tick_height: bank.max_tick_height, - block_height: bank.block_height, - fee_calculator: bank.fee_calculator, - capitalization: bank.capitalization, - inflation: bank.inflation, - transaction_count: bank.transaction_count, - stakes: bank.stakes, - epoch_stakes: bank.epoch_stakes, - storage_accounts: bank.storage_accounts, - parent_hash: bank.parent_hash, - parent_slot: bank.parent_slot, - hard_forks: Arc::new(RwLock::new(HardForks::default())), - collector_id: bank.collector_id, - collector_fees: bank.collector_fees, - ancestors: bank.ancestors, - hash: bank.hash, - is_delta: bank.is_delta, - tick_height: bank.tick_height, - signature_count: bank.signature_count, - message_processor: bank.message_processor, - entered_epoch_callback: bank.entered_epoch_callback, - last_vote_sync: bank.last_vote_sync, - } - } -} - #[cfg(test)] mod tests { use super::*;