Enable system program at SoftLaunch epoch 0 (#7313)

This commit is contained in:
Michael Vines
2019-12-06 23:16:28 -07:00
committed by GitHub
parent c00216e3be
commit 33f7103eae
5 changed files with 41 additions and 13 deletions

View File

@ -31,5 +31,6 @@ tempfile = "3.1.0"
solana-rayon-threadlimit = { path = "../rayon-threadlimit", version = "0.22.0" }
[dev-dependencies]
assert_matches = "1.3.0"
serial_test = "0.3.1"
serial_test_derive = "0.3.1"

View File

@ -170,9 +170,11 @@ impl LocalCluster {
.into_iter()
.collect()
}
// create_genesis_config_with_leader() assumes OperatingMode::Development so do
// nothing...
OperatingMode::Development => (),
OperatingMode::Development => {
genesis_config
.native_instruction_processors
.push(solana_storage_program!());
}
}
genesis_config.inflation =
@ -181,9 +183,6 @@ impl LocalCluster {
genesis_config
.native_instruction_processors
.extend_from_slice(&config.native_instruction_processors);
genesis_config
.native_instruction_processors
.push(solana_storage_program!());
let storage_keypair = Keypair::new();
genesis_config.add_account(

View File

@ -1,3 +1,4 @@
use assert_matches::assert_matches;
use log::*;
use serial_test_derive::serial;
use solana_client::thin_client::create_client;
@ -565,11 +566,30 @@ fn test_softlaunch_operating_mode() {
solana_core::cluster_info::VALIDATOR_PORT_RANGE,
);
// Programs that are not available at soft launch
// Programs that are available at soft launch epoch 0
for program_id in [
&solana_sdk::system_program::id(),
&solana_vote_program::id(),
&solana_stake_program::id(),
]
.iter()
{
assert_matches!(
(
program_id,
client
.get_account_with_commitment(program_id, CommitmentConfig::recent())
.unwrap()
),
(_program_id, Some(_))
);
}
// Programs that are not available at soft launch epoch 0
for program_id in [
&solana_config_program::id(),
&solana_sdk::bpf_loader::id(),
&solana_sdk::system_program::id(),
&solana_storage_program::id(),
&solana_vest_program::id(),
]
.iter()