Use solana-cli config keypair in solana-keygen (#8074)

* Use solana-cli config keypair in solana-keygen

* s/infile/keypair for consistency across modules and more generality across access methods

* Move config into separate crate

cli/Cargo.toml

@@ -17,7 +17,6 @@ criterion-stats = "0.3.0"
 ctrlc = { version = "3.1.3", features = ["termination"] }
 console = "0.9.2"
 dirs = "2.0.2"
-lazy_static = "1.4.0"
 log = "0.4.8"
 indicatif = "0.14.0"
 humantime = "2.0.0"
@@ -27,9 +26,9 @@ reqwest = { version = "0.10.1", default-features = false, features = ["blocking"
 serde = "1.0.104"
 serde_derive = "1.0.103"
 serde_json = "1.0.44"
-serde_yaml = "0.8.11"
 solana-budget-program = { path = "../programs/budget", version = "0.24.0" }
 solana-clap-utils = { path = "../clap-utils", version = "0.24.0" }
+solana-cli-config = { path = "../cli-config", version = "0.24.0" }
 solana-client = { path = "../client", version = "0.24.0" }
 solana-config-program = { path = "../programs/config", version = "0.24.0" }
 solana-faucet = { path = "../faucet", version = "0.24.0" }

cli/src/config.rs

@@ -1,49 +0,0 @@
-// Wallet settings that can be configured for long-term use
-use serde_derive::{Deserialize, Serialize};
-use std::fs::{create_dir_all, File};
-use std::io::{self, Write};
-use std::path::Path;
-
-lazy_static! {
-    pub static ref CONFIG_FILE: Option<String> = {
-        dirs::home_dir().map(|mut path| {
-            path.extend(&[".config", "solana", "cli", "config.yml"]);
-            path.to_str().unwrap().to_string()
-        })
-    };
-}
-
-#[derive(Serialize, Deserialize, Default, Debug, PartialEq)]
-pub struct Config {
-    pub url: String,
-    pub keypair_path: String,
-}
-
-impl Config {
-    pub fn new(url: &str, keypair_path: &str) -> Self {
-        Self {
-            url: url.to_string(),
-            keypair_path: keypair_path.to_string(),
-        }
-    }
-
-    pub fn load(config_file: &str) -> Result<Self, io::Error> {
-        let file = File::open(config_file.to_string())?;
-        let config = serde_yaml::from_reader(file)
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, format!("{:?}", err)))?;
-        Ok(config)
-    }
-
-    pub fn save(&self, config_file: &str) -> Result<(), io::Error> {
-        let serialized = serde_yaml::to_string(self)
-            .map_err(|err| io::Error::new(io::ErrorKind::Other, format!("{:?}", err)))?;
-
-        if let Some(outdir) = Path::new(&config_file).parent() {
-            create_dir_all(outdir)?;
-        }
-        let mut file = File::create(config_file)?;
-        file.write_all(&serialized.into_bytes())?;
-
-        Ok(())
-    }
-}

cli/src/lib.rs

@@ -1,9 +1,5 @@
-#[macro_use]
-extern crate lazy_static;
-
 pub mod cli;
 pub mod cluster_query;
-pub mod config;
 pub mod display;
 pub mod nonce;
 pub mod offline;

cli/src/main.rs

@@ -10,9 +10,9 @@ use solana_clap_utils::{
 };
 use solana_cli::{
     cli::{app, parse_command, process_command, CliCommandInfo, CliConfig, CliError},
-    config::{self, Config},
     display::{println_name_value, println_name_value_or},
 };
+use solana_cli_config::config::{Config, CONFIG_FILE};
 use solana_sdk::signature::read_keypair_file;
 
 use std::error;
@@ -162,7 +162,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
             .takes_value(true)
             .global(true)
             .help("Configuration file to use");
-        if let Some(ref config_file) = *config::CONFIG_FILE {
+        if let Some(ref config_file) = *CONFIG_FILE {
             arg.default_value(&config_file)
         } else {
             arg