Use lazy_static! instead of abusing DefaultArgs...

solana-labs · Mar 23, 2023 · 428fcfd · 428fcfd
1 parent 296b909
commit 428fcfd
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 19 deletions.
diff --git a/core/src/validator.rs b/core/src/validator.rs
@@ -28,6 +28,7 @@ use {
         tvu::{Tvu, TvuConfig, TvuSockets},
     },
     crossbeam_channel::{bounded, unbounded, Receiver},
+    lazy_static::lazy_static,
     rand::{thread_rng, Rng},
     solana_client::connection_cache::ConnectionCache,
     solana_entry::poh::compute_hash_time_ns,
@@ -135,11 +136,15 @@ impl BlockVerificationMethod {
         Self::VARIANTS
     }
 
-    pub fn cli_message() -> String {
-        format!(
-            "Switch transaction scheduling method for verifying ledger entries [default: {}]",
-            Self::default()
-        )
+    pub fn cli_message() -> &'static str {
+        lazy_static! {
+            static ref MESSAGE: String = format!(
+                "Switch transaction scheduling method for verifying ledger entries [default: {}]",
+                BlockVerificationMethod::default()
+            );
+        };
+
+        &MESSAGE
     }
 }
 
@@ -155,11 +160,15 @@ impl BlockProductionMethod {
         Self::VARIANTS
     }
 
-    pub fn cli_message() -> String {
-        format!(
-            "Switch transaction scheduling method for producing ledger entries [default: {}]",
-            Self::default()
-        )
+    pub fn cli_message() -> &'static str {
+        lazy_static! {
+            static ref MESSAGE: String = format!(
+                "Switch transaction scheduling method for producing ledger entries [default: {}]",
+                BlockProductionMethod::default()
+            );
+        };
+
+        &MESSAGE
     }
 }
 

diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -1651,8 +1651,6 @@ fn main() {
         .to_string();
     let default_graph_vote_account_mode = GraphVoteAccountMode::default();
 
-    let block_verification_method_help = &BlockVerificationMethod::cli_message();
-
     let mut measure_total_execution_time = Measure::start("ledger tool");
 
     let matches = App::new(crate_name!())
@@ -1718,7 +1716,7 @@ fn main() {
                 .possible_values(BlockVerificationMethod::cli_names())
                 .global(true)
                 .hidden(hidden_unless_forced())
-                .help(block_verification_method_help),
+                .help(BlockVerificationMethod::cli_message()),
         )
         .arg(
             Arg::with_name("output_format")

diff --git a/validator/src/cli.rs b/validator/src/cli.rs
@@ -1341,7 +1341,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
                 .value_name("METHOD")
                 .takes_value(true)
                 .possible_values(BlockVerificationMethod::cli_names())
-                .help(&default_args.block_verification_method_help),
+                .help(BlockVerificationMethod::cli_message())
         )
         .arg(
             Arg::with_name("block_production_method")
@@ -1350,7 +1350,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
                 .value_name("METHOD")
                 .takes_value(true)
                 .possible_values(BlockProductionMethod::cli_names())
-                .help(&default_args.block_production_method_help),
+                .help(BlockProductionMethod::cli_message())
         )
         .args(&get_deprecated_arguments())
         .after_help("The default subcommand is run")
@@ -1781,8 +1781,6 @@ pub struct DefaultArgs {
     pub wait_for_restart_window_max_delinquent_stake: String,
 
     pub banking_trace_dir_byte_limit: String,
-    pub block_verification_method_help: String,
-    pub block_production_method_help: String,
 }
 
 impl DefaultArgs {
@@ -1862,8 +1860,6 @@ 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(),
-            block_verification_method_help: BlockVerificationMethod::cli_message(),
-            block_production_method_help: BlockProductionMethod::cli_message(),
         }
     }
 }