From ecaad7bedabeb59fad7add8f55de9c776d3fb35e Mon Sep 17 00:00:00 2001 From: Brooks Date: Wed, 20 Sep 2023 23:45:55 -0400 Subject: [PATCH 1/2] Adds default info to cli arg for --accounts-hash-cache-path (#33331) (cherry picked from commit 1d39c3167d1e3ddff74773b1ff652ccee1f16355) # Conflicts: # ledger-tool/src/main.rs --- ledger-tool/src/main.rs | 8 ++++++++ validator/src/cli.rs | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index fa4e09ef420914..07a406db467d0e 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -1135,6 +1135,14 @@ fn main() { .value_name("PATHS") .takes_value(true) .help("Comma separated persistent accounts location"); +<<<<<<< HEAD +======= + let accounts_hash_cache_path_arg = Arg::with_name("accounts_hash_cache_path") + .long("accounts-hash-cache-path") + .value_name("PATH") + .takes_value(true) + .help("Use PATH as accounts hash cache location [default: /accounts_hash_cache]"); +>>>>>>> 1d39c3167d (Adds default info to cli arg for --accounts-hash-cache-path (#33331)) let accounts_index_path_arg = Arg::with_name("accounts_index_path") .long("accounts-index-path") .value_name("PATH") diff --git a/validator/src/cli.rs b/validator/src/cli.rs index 1b9266a49ea58a..3f8bd4fb29cc9c 100644 --- a/validator/src/cli.rs +++ b/validator/src/cli.rs @@ -289,7 +289,7 @@ pub fn app<'a>(version: &'a str, default_args: &'a DefaultArgs) -> App<'a, 'a> { .long("accounts-hash-cache-path") .value_name("PATH") .takes_value(true) - .help("Use PATH as accounts hash cache location"), + .help("Use PATH as accounts hash cache location [default: /accounts_hash_cache]"), ) .arg( Arg::with_name("snapshots") From 300e2b66770bfe5e5e93a67264b9b4a9a4361c4b Mon Sep 17 00:00:00 2001 From: brooks Date: Thu, 21 Sep 2023 08:43:45 -0500 Subject: [PATCH 2/2] resolve merge conflicts --- ledger-tool/src/main.rs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs index 07a406db467d0e..fa4e09ef420914 100644 --- a/ledger-tool/src/main.rs +++ b/ledger-tool/src/main.rs @@ -1135,14 +1135,6 @@ fn main() { .value_name("PATHS") .takes_value(true) .help("Comma separated persistent accounts location"); -<<<<<<< HEAD -======= - let accounts_hash_cache_path_arg = Arg::with_name("accounts_hash_cache_path") - .long("accounts-hash-cache-path") - .value_name("PATH") - .takes_value(true) - .help("Use PATH as accounts hash cache location [default: /accounts_hash_cache]"); ->>>>>>> 1d39c3167d (Adds default info to cli arg for --accounts-hash-cache-path (#33331)) let accounts_index_path_arg = Arg::with_name("accounts_index_path") .long("accounts-index-path") .value_name("PATH")