Don't allow omitting bankend value

solana-labs · Mar 22, 2023 · d1d317e · d1d317e
1 parent 3b9613f
commit d1d317e
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -135,6 +135,13 @@ impl ReplayingBackend {
     pub const fn cli_names() -> &'static [&'static str] {
         Self::VARIANTS
     }
+
+    pub fn cli_message() -> String {
+        format!(
+            "Switch transaction scheduling backend for validating ledger entries [default: {}]",
+            Self::default()
+        )
+    }
 }
 
 #[derive(Clone, EnumString, EnumVariantNames, Default, IntoStaticStr, Display)]
@@ -148,6 +155,13 @@ impl BankingBackend {
     pub const fn cli_names() -> &'static [&'static str] {
         Self::VARIANTS
     }
+
+    pub fn cli_message() -> String {
+        format!(
+            "Switch transaction scheduling backend for generating ledger entries [default: {}]",
+            Self::default()
+        )
+    }
 }
 
 pub struct ValidatorConfig {

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -1647,6 +1647,11 @@ fn main() {
         .to_string();
     let default_graph_vote_account_mode = GraphVoteAccountMode::default();
 
+    let (replaying_backend_help, banking_backend_help) = (
+        &ReplayingBackend::cli_message(),
+        &BankingBackend::cli_message(),
+    );
+
     let mut measure_total_execution_time = Measure::start("ledger tool");
 
     let matches = App::new(crate_name!())
@@ -1710,25 +1715,19 @@ fn main() {
                 .value_name("BACKEND")
                 .takes_value(true)
                 .possible_values(ReplayingBackend::cli_names())
-                .default_value(ReplayingBackend::default().into())
                 .global(true)
                 .hidden(hidden_unless_forced())
-                .help(
-                    "Switch transaction scheduling backend for validating ledger entries"
-                ),
+                .help(replaying_backend_help),
         )
         .arg(
             Arg::with_name("banking_backend")
                 .long("banking-backend")
                 .value_name("BACKEND")
                 .takes_value(true)
                 .possible_values(BankingBackend::cli_names())
-                .default_value(BankingBackend::default().into())
                 .global(true)
                 .hidden(hidden_unless_forced())
-                .help(
-                    "Switch transaction scheduling backend for generating ledger entries"
-                ),
+                .help(banking_backend_help),
         )
         .arg(
             Arg::with_name("output_format")

diff --git a/validator/src/cli.rs b/validator/src/cli.rs
@@ -1341,10 +1341,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
                 .value_name("BACKEND")
                 .takes_value(true)
                 .possible_values(ReplayingBackend::cli_names())
-                .default_value(&default_args.replaying_backend)
-                .help(
-                    "Switch transaction scheduling backend for validating ledger entries"
-                ),
+                .help(&default_args.replaying_backend_help),
         )
         .arg(
             Arg::with_name("banking_backend")
@@ -1353,10 +1350,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
                 .value_name("BACKEND")
                 .takes_value(true)
                 .possible_values(BankingBackend::cli_names())
-                .default_value(&default_args.banking_backend)
-                .help(
-                    "Switch transaction scheduling backend for generating ledger entries"
-                ),
+                .help(&default_args.banking_backend_help),
         )
         .args(&get_deprecated_arguments())
         .after_help("The default subcommand is run")
@@ -1787,8 +1781,8 @@ pub struct DefaultArgs {
     pub wait_for_restart_window_max_delinquent_stake: String,
 
     pub banking_trace_dir_byte_limit: String,
-    pub replaying_backend: String,
-    pub banking_backend: String,
+    pub replaying_backend_help: String,
+    pub banking_backend_help: String,
 }
 
 impl DefaultArgs {
@@ -1868,8 +1862,8 @@ impl DefaultArgs {
             wait_for_restart_window_min_idle_time: "10".to_string(),
             wait_for_restart_window_max_delinquent_stake: "5".to_string(),
             banking_trace_dir_byte_limit: BANKING_TRACE_DIR_DEFAULT_BYTE_LIMIT.to_string(),
-            replaying_backend: ReplayingBackend::default().to_string(),
-            banking_backend: BankingBackend::default().to_string(),
+            replaying_backend_help: ReplayingBackend::cli_message(),
+            banking_backend_help: BankingBackend::cli_message(),
         }
     }
 }