token-cli: produce error if invalid --config option (#3166)

* token-cli: produce error if invalid --config option

* token-cli: add test for invalid --config

Author: dboures

Cargo.lock

@@ -33,6 +33,7 @@ spl-memo = { version = "3.0.1", path="../../memo/program", features = ["no-entry
 
 [dev-dependencies]
 solana-test-validator = "=1.10.19"
+assert_cmd = "2.0.4"
 
 [[bin]]
 name = "spl-token"

token/cli/Cargo.toml

@@ -2539,7 +2539,10 @@ fn main() -> Result<(), Error> {
 
     let config = {
         let cli_config = if let Some(config_file) = matches.value_of("config_file") {
-            solana_cli_config::Config::load(config_file).unwrap_or_default()
+            solana_cli_config::Config::load(config_file).unwrap_or_else(|_| {
+                eprintln!("error: Could not find config file `{}`", config_file);
+                exit(1);
+            })
         } else {
             solana_cli_config::Config::default()
         };
@@ -3138,13 +3141,14 @@ fn handle_tx(
 mod tests {
     use {
         super::*,
+        assert_cmd::prelude::*,
         solana_client::blockhash_query::Source,
         solana_sdk::{
             bpf_loader,
             signature::{Keypair, Signer},
         },
         solana_test_validator::{ProgramInfo, TestValidator, TestValidatorGenesis},
-        std::path::PathBuf,
+        std::{path::PathBuf, process::Command},
     };
 
     fn clone_keypair(keypair: &Keypair) -> Keypair {
@@ -3633,4 +3637,16 @@ mod tests {
         assert_eq!(ui_account.mint, token.to_string());
         assert_eq!(ui_account.owner, aux_string);
     }
+
+    #[test]
+    fn invalid_config_will_cause_commands_to_fail() {
+        let mut cmd = Command::cargo_bin("spl-token").unwrap();
+        let args = &["address", "--config", "~/nonexistent/config.yml"];
+
+        cmd.args(args)
+            .assert()
+            .stderr("error: Could not find config file `~/nonexistent/config.yml`\n");
+
+        cmd.args(args).assert().code(1).failure();
+    }
 }