mirror of
https://github.com/sigp/lighthouse.git
synced 2026-03-15 02:42:38 +00:00
f53dedb27d
## Proposed Changes Fixes some sharp edges on the new `lighthouse account validator list` command, and the account manager CLI. * Validator names/keys are always printed in the same order due to the use of a sorted `BTreeMap` * The `validator list` subcommand now respects the `--validator-dir` flag, instead of always looking in `~/.lighthouse/validators` * The `--help` now shows a description for the `wallet` subcommand instead of just `TODO`
42 lines
1.2 KiB
Rust
42 lines
1.2 KiB
Rust
use crate::VALIDATOR_DIR_FLAG;
|
|
use clap::{App, Arg, ArgMatches};
|
|
use std::path::PathBuf;
|
|
use validator_dir::Manager as ValidatorManager;
|
|
|
|
pub const CMD: &str = "list";
|
|
|
|
pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
|
|
App::new(CMD)
|
|
.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/validators",
|
|
)
|
|
.takes_value(true),
|
|
)
|
|
.about("Lists the names of all validators.")
|
|
}
|
|
|
|
pub fn cli_run(matches: &ArgMatches<'_>) -> Result<(), String> {
|
|
let data_dir = clap_utils::parse_path_with_default_in_home_dir(
|
|
matches,
|
|
VALIDATOR_DIR_FLAG,
|
|
PathBuf::new().join(".lighthouse").join("validators"),
|
|
)?;
|
|
|
|
let mgr = ValidatorManager::open(&data_dir)
|
|
.map_err(|e| format!("Unable to read --{}: {:?}", VALIDATOR_DIR_FLAG, e))?;
|
|
|
|
for (name, _path) in mgr
|
|
.directory_names()
|
|
.map_err(|e| format!("Unable to list wallets: {:?}", e))?
|
|
{
|
|
println!("{}", name)
|
|
}
|
|
|
|
Ok(())
|
|
}
|