Extract duplicate clap helpers into clap-utils (#6812)

This commit is contained in:
Ryo Onodera
2019-11-12 09:42:08 +09:00
committed by GitHub
parent 95d6586dd7
commit d84f367317
21 changed files with 89 additions and 95 deletions

View File

@@ -10,6 +10,7 @@ homepage = "https://solana.com/"
[dependencies]
clap = "2.33.0"
console = "0.9.1"
solana-clap-utils = { path = "../clap-utils", version = "0.21.0" }
solana-core = { path = "../core", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-metrics = { path = "../metrics", version = "0.21.0" }

View File

@@ -1,5 +1,6 @@
use clap::{crate_description, crate_name, crate_version, App, Arg};
use console::style;
use solana_clap_utils::input_validators::is_keypair;
use solana_core::{
archiver::Archiver,
cluster_info::{Node, VALIDATOR_PORT_RANGE},
@@ -11,13 +12,6 @@ use solana_sdk::{
};
use std::{net::SocketAddr, path::PathBuf, process::exit, sync::Arc};
// Return an error if a keypair file cannot be parsed.
fn is_keypair(string: String) -> Result<(), String> {
read_keypair_file(&string)
.map(|_| ())
.map_err(|err| format!("{:?}", err))
}
fn main() {
solana_logger::setup();