57489e620f
## Issue Addressed #1992 and #1987, and also to be considered a continuation of #1751 ## Proposed Changes many changed files but most are renaming to align the code with the semantics of `--network` - remove the `--network` default value (in clap) and instead set it after checking the `network` and `testnet-dir` flags - move `eth2_testnet_config` crate to `eth2_network_config` - move `Eth2TestnetConfig` to `Eth2NetworkConfig` - move `DEFAULT_HARDCODED_TESTNET` to `DEFAULT_HARDCODED_NETWORK` - `beacon_node`s `get_eth2_testnet_config` loads the `DEFAULT_HARDCODED_NETWORK` if there is no network nor testnet provided - `boot_node`s config loads the config same as the `beacon_node`, it was using the configuration only for preconfigured networks (That code is ~1year old so I asume it was not intended) - removed a one year old comment stating we should try to emulate `https://github.com/eth2-clients/eth2-testnets/tree/master/nimbus/testnet1` it looks outdated (?) - remove `lighthouse`s `load_testnet_config` in favor of `get_eth2_network_config` to centralize that logic (It had differences) - some spelling ## Additional Info Both the command of #1992 and the scripts of #1987 seem to work fine, same as `bn` and `vc`
79 lines
2.6 KiB
Rust
79 lines
2.6 KiB
Rust
use clap::ArgMatches;
|
|
pub use eth2_network_config::DEFAULT_HARDCODED_NETWORK;
|
|
use std::fs::{self, create_dir_all};
|
|
use std::path::{Path, PathBuf};
|
|
|
|
/// Names for the default directories.
|
|
pub const DEFAULT_ROOT_DIR: &str = ".lighthouse";
|
|
pub const DEFAULT_BEACON_NODE_DIR: &str = "beacon";
|
|
pub const DEFAULT_NETWORK_DIR: &str = "network";
|
|
pub const DEFAULT_VALIDATOR_DIR: &str = "validators";
|
|
pub const DEFAULT_SECRET_DIR: &str = "secrets";
|
|
pub const DEFAULT_WALLET_DIR: &str = "wallets";
|
|
|
|
/// Base directory name for unnamed testnets passed through the --testnet-dir flag
|
|
pub const CUSTOM_TESTNET_DIR: &str = "custom";
|
|
|
|
/// Gets the network directory name
|
|
///
|
|
/// Tries to get the name first from the "network" flag,
|
|
/// if not present, then checks the "testnet-dir" flag and returns a custom name
|
|
/// If neither flags are present, returns the default hardcoded network name.
|
|
pub fn get_network_dir(matches: &ArgMatches) -> String {
|
|
if let Some(network_name) = matches.value_of("network") {
|
|
network_name.to_string()
|
|
} else if matches.value_of("testnet-dir").is_some() {
|
|
CUSTOM_TESTNET_DIR.to_string()
|
|
} else {
|
|
eth2_network_config::DEFAULT_HARDCODED_NETWORK.to_string()
|
|
}
|
|
}
|
|
|
|
/// Checks if a directory exists in the given path and creates a directory if it does not exist.
|
|
pub fn ensure_dir_exists<P: AsRef<Path>>(path: P) -> Result<(), String> {
|
|
let path = path.as_ref();
|
|
|
|
if !path.exists() {
|
|
create_dir_all(path).map_err(|e| format!("Unable to create {:?}: {:?}", path, e))?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// If `arg` is in `matches`, parses the value as a path.
|
|
///
|
|
/// Otherwise, attempts to find the default directory for the `testnet` from the `matches`
|
|
/// and appends `flag` to it.
|
|
pub fn parse_path_or_default_with_flag(
|
|
matches: &ArgMatches,
|
|
arg: &'static str,
|
|
flag: &str,
|
|
) -> Result<PathBuf, String> {
|
|
clap_utils::parse_path_with_default_in_home_dir(
|
|
matches,
|
|
arg,
|
|
PathBuf::new()
|
|
.join(DEFAULT_ROOT_DIR)
|
|
.join(get_network_dir(matches))
|
|
.join(flag),
|
|
)
|
|
}
|
|
|
|
/// Get the approximate size of a directory and its contents.
|
|
///
|
|
/// Will skip unreadable files, and files. Not 100% accurate if files are being created and deleted
|
|
/// while this function is running.
|
|
pub fn size_of_dir(path: &Path) -> u64 {
|
|
if let Ok(iter) = fs::read_dir(path) {
|
|
iter.filter_map(std::result::Result::ok)
|
|
.map(size_of_dir_entry)
|
|
.sum()
|
|
} else {
|
|
0
|
|
}
|
|
}
|
|
|
|
fn size_of_dir_entry(dir: fs::DirEntry) -> u64 {
|
|
dir.metadata().map(|m| m.len()).unwrap_or(0)
|
|
}
|