diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs index df20c5f45e..bab398eb4e 100644 --- a/genesis-programs/src/lib.rs +++ b/genesis-programs/src/lib.rs @@ -72,9 +72,7 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option { - if epoch == std::u64::MAX - 1 { - // The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in - // a future hard fork. + if epoch == 34 { Some(vec![solana_bpf_loader_program!()]) } else if epoch == std::u64::MAX { // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a @@ -163,7 +161,7 @@ mod tests { #[test] fn test_softlaunch_programs() { assert_eq!(get_programs(OperatingMode::Stable, 1), None); - assert!(get_programs(OperatingMode::Stable, std::u64::MAX - 1).is_some()); + assert!(get_programs(OperatingMode::Stable, 34).is_some()); assert!(get_programs(OperatingMode::Stable, std::u64::MAX).is_some()); } } diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs index 4908901aa9..dd68f58ce4 100644 --- a/runtime/src/bank.rs +++ b/runtime/src/bank.rs @@ -860,8 +860,7 @@ impl Bank { // DANGER: Adjust this guard after tds has transitioned to the eager rent // collection and ABSOLUTELY after the mainnet-beta transitions to v1.1. if !(self.operating_mode() == OperatingMode::Preview && self.epoch() < 47 - || self.operating_mode() == OperatingMode::Stable - && self.epoch() < Epoch::max_value()) + || self.operating_mode() == OperatingMode::Stable && self.epoch() < 34) { self.collect_rent_eagerly(); }