cli: sort option for validators by version (#24236)

(cherry picked from commit 91993d8) # Conflicts: # Cargo.lock # cli-output/Cargo.toml # programs/bpf/Cargo.lock Co-authored-by: Trent Nelson <[email protected]>
solana-labs · Apr 14, 2022 · 4e5edd8 · 4e5edd8
1 parent 2ac42ef
commit 4e5edd8
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli-output/Cargo.toml b/cli-output/Cargo.toml
@@ -17,6 +17,7 @@ console = "0.15.0"
 humantime = "2.0.1"
 Inflector = "0.11.4"
 indicatif = "0.16.2"
+semver = "1.0.6"
 serde = "1.0.130"
 serde_json = "1.0.72"
 solana-account-decoder = { path = "../account-decoder", version = "=1.9.16" }

diff --git a/cli-output/src/cli_output.rs b/cli-output/src/cli_output.rs
@@ -356,6 +356,7 @@ pub enum CliValidatorsSortOrder {
     SkipRate,
     Stake,
     VoteAccount,
+    Version,
 }
 
 #[derive(Serialize, Deserialize)]
@@ -494,6 +495,22 @@ impl fmt::Display for CliValidators {
             CliValidatorsSortOrder::Stake => {
                 sorted_validators.sort_by_key(|a| a.activated_stake);
             }
+            CliValidatorsSortOrder::Version => {
+                sorted_validators.sort_by(|a, b| {
+                    use std::cmp::Ordering;
+                    let a_version = semver::Version::parse(a.version.as_str()).ok();
+                    let b_version = semver::Version::parse(b.version.as_str()).ok();
+                    match (a_version, b_version) {
+                        (None, None) => a.version.cmp(&b.version),
+                        (None, Some(_)) => Ordering::Less,
+                        (Some(_), None) => Ordering::Greater,
+                        (Some(va), Some(vb)) => match va.cmp(&vb) {
+                            Ordering::Equal => a.activated_stake.cmp(&b.activated_stake),
+                            ordering => ordering,
+                        },
+                    }
+                });
+            }
         }
 
         if self.validators_reverse_sort {

diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs
@@ -369,6 +369,7 @@ impl ClusterQuerySubCommands for App<'_, '_> {
                             "root",
                             "skip-rate",
                             "stake",
+                            "version",
                             "vote-account",
                         ])
                         .default_value("stake")
@@ -638,6 +639,7 @@ pub fn parse_show_validators(matches: &ArgMatches<'_>) -> Result<CliCommandInfo,
         "skip-rate" => CliValidatorsSortOrder::SkipRate,
         "stake" => CliValidatorsSortOrder::Stake,
         "vote-account" => CliValidatorsSortOrder::VoteAccount,
+        "version" => CliValidatorsSortOrder::Version,
         _ => unreachable!(),
     };
 

diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock