Align the `solana validators` output columns for -ud,-ut, and -um

This commit is contained in:
Michael Vines 2022-02-27 09:41:15 -08:00
parent a57c7ba5df
commit 87b76aeeb0
1 changed files with 18 additions and 18 deletions

View File

@ -395,17 +395,17 @@ impl fmt::Display for CliValidators {
if v == 0 { if v == 0 {
" - ".into() " - ".into()
} else if v == max_v { } else if v == max_v {
format!("{:>8} ( 0)", v) format!("{:>9} ( 0)", v)
} else if v > max_v.saturating_sub(100) { } else if v > max_v.saturating_sub(100) {
format!("{:>8} ({:>3})", v, -(max_v.saturating_sub(v) as isize)) format!("{:>9} ({:>3})", v, -(max_v.saturating_sub(v) as isize))
} else { } else {
format!("{:>8} ", v) format!("{:>9} ", v)
} }
} }
writeln!( writeln!(
f, f,
"{} {:<44} {:<44} {:>3}% {:>14} {:>14} {:>7} {:>8} {:>7} {}", "{} {:<44} {:<44} {:>3}% {:>14} {:>14} {:>7} {:>8} {:>7} {:>22} ({:.2}%)",
if validator.delinquent { if validator.delinquent {
WARNING.to_string() WARNING.to_string()
} else { } else {
@ -423,16 +423,16 @@ impl fmt::Display for CliValidators {
}, },
validator.epoch_credits, validator.epoch_credits,
validator.version, validator.version,
if validator.activated_stake > 0 { build_balance_message_with_config(
format!( validator.activated_stake,
"{} ({:.2}%)", &BuildBalanceMessageConfig {
build_balance_message(validator.activated_stake, use_lamports_unit, true), use_lamports_unit,
trim_trailing_zeros: false,
..BuildBalanceMessageConfig::default()
}
),
100. * validator.activated_stake as f64 / total_active_stake as f64, 100. * validator.activated_stake as f64 / total_active_stake as f64,
) )
} else {
"-".into()
},
)
} }
let padding = if self.number_validators { let padding = if self.number_validators {