validator: deprecates --disable-accounts-disk-index (#33850)

* validator: deprecates `--disable-accounts-disk-index` * Fix checks failure * Move disable_accounts_disk_index arg to alphabetical order --------- Co-authored-by: Will Hickey <will.hickey@solana.com> (cherry picked from commit c55a6e5) # Conflicts: # validator/src/cli.rs
solana-labs · Nov 14, 2023 · 8e60627 · 8e60627
1 parent 1776575
commit 8e60627
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/validator/src/cli.rs b/validator/src/cli.rs
@@ -1241,12 +1241,6 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> {
                 .takes_value(true)
                 .help("How much memory the accounts index can consume. If this is exceeded, some account index entries will be stored on disk."),
         )
-        .arg(
-            Arg::with_name("disable_accounts_disk_index")
-                .long("disable-accounts-disk-index")
-                .help("Disable the disk-based accounts index if it is enabled by default.")
-                .conflicts_with("accounts_index_memory_limit_mb")
-        )
         .arg(
             Arg::with_name("accounts_index_bins")
                 .long("accounts-index-bins")
@@ -1729,6 +1723,25 @@ fn deprecated_arguments() -> Vec<DeprecatedArg> {
             .help("Enables faster starting of validators by skipping startup clean and shrink."),
         usage_warning: "Enabled by default",
     );
+<<<<<<< HEAD
+=======
+    add_arg!(Arg::with_name("accounts_hash_interval_slots")
+        .long("accounts-hash-interval-slots")
+        .value_name("NUMBER")
+        .takes_value(true)
+        .help("Number of slots between verifying accounts hash.")
+        .validator(|val| {
+            if val.eq("0") {
+                Err(String::from("Accounts hash interval cannot be zero"))
+            } else {
+                Ok(())
+            }
+        }));
+    add_arg!(Arg::with_name("disable_accounts_disk_index")
+        .long("disable-accounts-disk-index")
+        .help("Disable the disk-based accounts index if it is enabled by default.")
+        .conflicts_with("accounts_index_memory_limit_mb"));
+>>>>>>> c55a6e55a1 (validator: deprecates `--disable-accounts-disk-index` (#33850))
     add_arg!(
         Arg::with_name("disable_quic_servers")
             .long("disable-quic-servers")