gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
This commit is contained in:
Tyera Eulberg
2020-01-31 19:27:37 -07:00
committed by GitHub
parent 408ef8b2cb
commit fab8ef379f
10 changed files with 86 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cli/src/main.rs
View File

@@ -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