Merge branch 'master' into fix/cli-commands

Author: gzalz

cli/src/handler.rs

@@ -82,12 +82,7 @@ impl CliHandler {
                 let config_file = solana_cli_config::CONFIG_FILE
                     .as_ref()
                     .ok_or_else(|| anyhow!("unable to get config file path"))?;
-                match Config::load(config_file) {
-                    Ok(config) => read_keypair_file(config.keypair_path.as_str())
-                        .map_err(|e| anyhow!("Failed to read keypair path: {e:?}"))?,
-                    Err(_) => read_keypair_file(args.keypair_path.clone().unwrap())
-                        .map_err(|e| anyhow!("Failed to read keypair path: {e:?}"))?,
-                }
+                Config::load(config_file)?
             }
         };