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

Adjust bpf epoch for tests, not effecting prod. (#12387)

Browse Source 
* Adjust bpf epoch for tests, not effecting prod.

* Fix local cluster test...
This commit is contained in:
Ryo Onodera
2020-09-23 04:55:08 +09:00
committed by GitHub
parent 495e237935
commit 3612964a58
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
genesis-programs/src/lib.rs
View File

@ -62,9 +62,13 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
} }
} }
OperatingMode::Stable => { OperatingMode::Stable => {
if epoch == std::u64::MAX - 1 { if epoch == 0 {
// The epoch of std::u64::MAX - 1 is a placeholder and is expected to be reduced in // In fact, mainnet-beta enabled bpf_loader at epoch 34, but pretend we're enabling it
// a future hard fork. // at epoch 0 only for the sake of the upgrade test because it must warp and warping
// is broken in many ways around scheduled program activations in this branch (v1.2).
// This way, we can avoid backporting the large and conflict-laden pr:
// https://github.com/solana-labs/solana/pull/11736
// For actual live cluster, this condition never evaluates to true because of using == not >= or the like
Some(vec![solana_bpf_loader_program!()]) Some(vec![solana_bpf_loader_program!()])
} else if epoch == std::u64::MAX { } else if epoch == std::u64::MAX {
// The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
@ -159,7 +163,7 @@ mod tests {
#[test] #[test]
fn test_softlaunch_programs() { fn test_softlaunch_programs() {
assert_eq!(get_programs(OperatingMode::Stable, 1), None); assert_eq!(get_programs(OperatingMode::Stable, 1), None);
assert!(get_programs(OperatingMode::Stable, std::u64::MAX - 1).is_some()); assert!(get_programs(OperatingMode::Stable, 0).is_some());
assert!(get_programs(OperatingMode::Stable, std::u64::MAX).is_some()); assert!(get_programs(OperatingMode::Stable, std::u64::MAX).is_some());
} }
} }

2
local-cluster/tests/local_cluster.rs
View File

@ -562,7 +562,7 @@ fn test_stable_operating_mode() {
} }
// Programs that are not available at epoch 0 // Programs that are not available at epoch 0
for program_id in [&solana_sdk::bpf_loader::id(), &solana_vest_program::id()].iter() { for program_id in [&solana_vest_program::id()].iter() {
assert_eq!( assert_eq!(
( (
program_id, program_id,