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

Clean up mainnet-beta inflation candidate features

Browse Source
This commit is contained in:
Michael Vines
2021-02-10 12:31:44 -08:00
parent 10abd199e1
commit 47c60f8e98
2 changed files with 30 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runtime/src/bank.rs
View File

@ -11834,7 +11834,8 @@ pub(crate) mod tests {
bank = new_from_parent(&Arc::new(bank));
assert_eq!(bank.slot(), 3);
// Request `full_inflation::devnet_and_testnet` activation, which takes priority over pico_inflation
// Request `full_inflation::devnet_and_testnet` activation,
// which takes priority over pico_inflation
bank.store_account(
&feature_set::full_inflation::devnet_and_testnet::id(),
&feature::create_account(
@ -11847,9 +11848,10 @@ pub(crate) mod tests {
bank.compute_active_feature_set(true);
assert_eq!(bank.get_inflation_start_slot(), 2);
// Request `full_inflation::candidate_example` activation, which should have no effect on `get_inflation_start_slot`
// Request `full_inflation::mainnet::certusone` activation,
// which should have no effect on `get_inflation_start_slot`
bank.store_account(
&feature_set::full_inflation::candidate_example::vote::id(),
&feature_set::full_inflation::mainnet::certusone::vote::id(),
&feature::create_account(
&Feature {
activated_at: Some(3),
@ -11858,7 +11860,7 @@ pub(crate) mod tests {
),
);
bank.store_account(
&feature_set::full_inflation::candidate_example::enable::id(),
&feature_set::full_inflation::mainnet::certusone::enable::id(),
&feature::create_account(
&Feature {
activated_at: Some(3),
@ -11913,9 +11915,10 @@ pub(crate) mod tests {
bank = new_from_parent(&Arc::new(bank));
assert_eq!(bank.slot(), 3);
// Request `full_inflation::candidate_example` activation, which takes priority over pico_inflation
// Request `full_inflation::mainnet::certusone` activation,
// which takes priority over pico_inflation
bank.store_account(
&feature_set::full_inflation::candidate_example::vote::id(),
&feature_set::full_inflation::mainnet::certusone::vote::id(),
&feature::create_account(
&Feature {
activated_at: Some(2),
@ -11924,7 +11927,7 @@ pub(crate) mod tests {
),
);
bank.store_account(
&feature_set::full_inflation::candidate_example::enable::id(),
&feature_set::full_inflation::mainnet::certusone::enable::id(),
&feature::create_account(
&Feature {
activated_at: Some(2),
@ -11939,8 +11942,8 @@ pub(crate) mod tests {
bank = new_from_parent(&Arc::new(bank));
assert_eq!(bank.slot(), 4);
// Request `full_inflation::devnet_and_testnet` activation, which should have no effect on
// `get_inflation_start_slot`
// Request `full_inflation::devnet_and_testnet` activation,
// which should have no effect on `get_inflation_start_slot`
bank.store_account(
&feature_set::full_inflation::devnet_and_testnet::id(),
&feature::create_account(