mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-09 19:51:47 +00:00
b69c63d486
## Issue Addressed Resolves #1744 ## Proposed Changes - Add `directory::ensure_dir_exists` to the `ValidatorDefinition::open_or_create` method - As @pawanjay176 suggested, making the `--validator-dir` non-global so users are forced to include the flag after the `validator` subcommand. Current behavior seems to be ignoring the flag if it comes after something like `validator import` ## Additional Info N/A
63 lines
2.3 KiB
Rust
63 lines
2.3 KiB
Rust
pub mod create;
|
|
pub mod deposit;
|
|
pub mod import;
|
|
pub mod list;
|
|
pub mod recover;
|
|
pub mod slashing_protection;
|
|
|
|
use crate::VALIDATOR_DIR_FLAG;
|
|
use clap::{App, Arg, ArgMatches};
|
|
use directory::{parse_path_or_default_with_flag, DEFAULT_VALIDATOR_DIR};
|
|
use environment::Environment;
|
|
use std::path::PathBuf;
|
|
use types::EthSpec;
|
|
|
|
pub const CMD: &str = "validator";
|
|
|
|
pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
|
|
App::new(CMD)
|
|
.about("Provides commands for managing Eth2 validators.")
|
|
.arg(
|
|
Arg::with_name(VALIDATOR_DIR_FLAG)
|
|
.long(VALIDATOR_DIR_FLAG)
|
|
.value_name("VALIDATOR_DIRECTORY")
|
|
.help(
|
|
"The path to search for validator directories. \
|
|
Defaults to ~/.lighthouse/{testnet}/validators",
|
|
)
|
|
.takes_value(true)
|
|
.conflicts_with("datadir"),
|
|
)
|
|
.subcommand(create::cli_app())
|
|
.subcommand(deposit::cli_app())
|
|
.subcommand(import::cli_app())
|
|
.subcommand(list::cli_app())
|
|
.subcommand(recover::cli_app())
|
|
.subcommand(slashing_protection::cli_app())
|
|
}
|
|
|
|
pub fn cli_run<T: EthSpec>(matches: &ArgMatches, env: Environment<T>) -> Result<(), String> {
|
|
let validator_base_dir = if matches.value_of("datadir").is_some() {
|
|
let path: PathBuf = clap_utils::parse_required(matches, "datadir")?;
|
|
path.join(DEFAULT_VALIDATOR_DIR)
|
|
} else {
|
|
parse_path_or_default_with_flag(matches, VALIDATOR_DIR_FLAG, DEFAULT_VALIDATOR_DIR)?
|
|
};
|
|
eprintln!("validator-dir path: {:?}", validator_base_dir);
|
|
|
|
match matches.subcommand() {
|
|
(create::CMD, Some(matches)) => create::cli_run::<T>(matches, env, validator_base_dir),
|
|
(deposit::CMD, Some(matches)) => deposit::cli_run::<T>(matches, env, validator_base_dir),
|
|
(import::CMD, Some(matches)) => import::cli_run(matches, validator_base_dir),
|
|
(list::CMD, Some(_)) => list::cli_run(validator_base_dir),
|
|
(recover::CMD, Some(matches)) => recover::cli_run(matches, validator_base_dir),
|
|
(slashing_protection::CMD, Some(matches)) => {
|
|
slashing_protection::cli_run(matches, env, validator_base_dir)
|
|
}
|
|
(unknown, _) => Err(format!(
|
|
"{} does not have a {} command. See --help",
|
|
CMD, unknown
|
|
)),
|
|
}
|
|
}
|