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

Skip 'Stake by Feature Set' output when showing status of a single feature (#13052)

Browse Source 
(cherry picked from commit ad65d4785e)

Co-authored-by: Michael Vines <mvines@gmail.com>
This commit is contained in:
mergify[bot]
2020-10-21 07:14:49 +00:00
committed by GitHub
parent b1712e80ec
commit 8752bf0826
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cli/src/feature.rs
View File

@ -230,7 +230,7 @@ fn active_stake_by_feature_set(rpc_client: &RpcClient) -> Result<HashMap<u32, u6
} }
// Feature activation is only allowed when 95% of the active stake is on the current feature set // Feature activation is only allowed when 95% of the active stake is on the current feature set
fn feature_activation_allowed(rpc_client: &RpcClient) -> Result<bool, ClientError> { fn feature_activation_allowed(rpc_client: &RpcClient, quiet: bool) -> Result<bool, ClientError> {
let my_feature_set = solana_version::Version::default().feature_set; let my_feature_set = solana_version::Version::default().feature_set;
let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?; let active_stake_by_feature_set = active_stake_by_feature_set(rpc_client)?;
@ -240,8 +240,8 @@ fn feature_activation_allowed(rpc_client: &RpcClient) -> Result<bool, ClientErro
.map(|percentage| *percentage >= 95) .map(|percentage| *percentage >= 95)
.unwrap_or(false); .unwrap_or(false);
if !feature_activation_allowed { if !feature_activation_allowed && !quiet {
println!("\n{}", style("Stake By Feature Set:").bold()); println!("{}", style("Stake By Feature Set:").bold());
for (feature_set, percentage) in active_stake_by_feature_set.iter() { for (feature_set, percentage) in active_stake_by_feature_set.iter() {
if *feature_set == 0 { if *feature_set == 0 {
println!("unknown - {}%", percentage); println!("unknown - {}%", percentage);
@ -258,6 +258,7 @@ fn feature_activation_allowed(rpc_client: &RpcClient) -> Result<bool, ClientErro
); );
} }
} }
println!();
} }
Ok(feature_activation_allowed) Ok(feature_activation_allowed)
@ -299,9 +300,10 @@ fn process_status(
}); });
} }
let feature_activation_allowed = feature_activation_allowed(rpc_client, features.len() <= 1)?;
let feature_set = CliFeatures { let feature_set = CliFeatures {
features, features,
feature_activation_allowed: feature_activation_allowed(rpc_client)?, feature_activation_allowed,
inactive, inactive,
}; };
Ok(config.output_format.formatted_string(&feature_set)) Ok(config.output_format.formatted_string(&feature_set))
@ -323,7 +325,7 @@ fn process_activate(
} }
} }
if !feature_activation_allowed(rpc_client)? { if !feature_activation_allowed(rpc_client, false)? {
return Err("Feature activation is not allowed at this time".into()); return Err("Feature activation is not allowed at this time".into());
} }