From 29730b5a19de0b039b5310b5a4835f60b238ee45 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 11 Mar 2021 22:28:34 +0000
Subject: [PATCH] Default --ledger arg to "ledger" for `solana-validator` and
 `solana-ledger-tool` (#15809)

(cherry picked from commit aa2b2d6b7502ecbdf1fe02dada899bd1cb5cc362)

Co-authored-by: Michael Vines <mvines@gmail.com>
---
 ledger-tool/src/bigtable.rs |  3 ++-
 ledger-tool/src/main.rs     | 16 ++++++++++++----
 validator/src/main.rs       |  3 ++-
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ledger-tool/src/bigtable.rs b/ledger-tool/src/bigtable.rs
index 2a9e4fc271..d4977da243 100644
--- a/ledger-tool/src/bigtable.rs
+++ b/ledger-tool/src/bigtable.rs
@@ -221,7 +221,8 @@ impl BigTableSubCommand for App<'_, '_> {
         self.subcommand(
             SubCommand::with_name("bigtable")
                 .about("Ledger data on a BigTable instance")
-                .setting(AppSettings::ArgRequiredElseHelp)
+                .setting(AppSettings::InferSubcommands)
+                .setting(AppSettings::SubcommandRequiredElseHelp)
                 .subcommand(
                     SubCommand::with_name("upload")
                         .about("Upload the ledger to BigTable")
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
index 484bb1bcfb..c522259ca4 100644
--- a/ledger-tool/src/main.rs
+++ b/ledger-tool/src/main.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::integer_arithmetic)]
 use clap::{
-    crate_description, crate_name, value_t, value_t_or_exit, values_t_or_exit, App, Arg,
-    ArgMatches, SubCommand,
+    crate_description, crate_name, value_t, value_t_or_exit, values_t_or_exit, App, AppSettings,
+    Arg, ArgMatches, SubCommand,
 };
 use itertools::Itertools;
 use log::*;
@@ -811,6 +811,9 @@ fn main() {
     let matches = App::new(crate_name!())
         .about(crate_description!())
         .version(solana_version::version!())
+        .setting(AppSettings::InferSubcommands)
+        .setting(AppSettings::SubcommandRequiredElseHelp)
+        .setting(AppSettings::VersionlessSubcommands)
         .arg(
             Arg::with_name("ledger_path")
                 .short("l")
@@ -818,7 +821,8 @@ fn main() {
                 .value_name("DIR")
                 .takes_value(true)
                 .global(true)
-                .help("Use DIR for ledger location"),
+                .default_value("ledger")
+                .help("Use DIR as ledger location"),
         )
         .arg(
             Arg::with_name("wal_recovery_mode")
@@ -1355,7 +1359,11 @@ fn main() {
 
     // Canonicalize ledger path to avoid issues with symlink creation
     let ledger_path = fs::canonicalize(&ledger_path).unwrap_or_else(|err| {
-        eprintln!("Unable to access ledger path: {:?}", err);
+        eprintln!(
+            "Unable to access ledger path '{}': {}",
+            ledger_path.display(),
+            err
+        );
         exit(1);
     });
 
diff --git a/validator/src/main.rs b/validator/src/main.rs
index 26cf4e08e0..c8ee57781a 100644
--- a/validator/src/main.rs
+++ b/validator/src/main.rs
@@ -848,7 +848,8 @@ pub fn main() {
                 .value_name("DIR")
                 .takes_value(true)
                 .required(true)
-                .help("Use DIR as persistent ledger location"),
+                .default_value("ledger")
+                .help("Use DIR as ledger location"),
         )
         .arg(
             Arg::with_name("entrypoint")