Skip to content

fix(clap_utils): provide context-specific error messages for network config #8385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: stable
Choose a base branch
from
Open

fix(clap_utils): provide context-specific error messages for network config #8385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions common/clap_utils/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,23 @@ pub const FLAG_HEADER: &str = "Flags";
/// Try to parse the eth2 network config from the `network`, `testnet-dir` flags in that order.
/// Returns the default hardcoded testnet if neither flags are set.
pub fn get_eth2_network_config(cli_args: &ArgMatches) -> Result<Eth2NetworkConfig, String> {
let optional_network_config = if cli_args.contains_id("network") {
parse_hardcoded_network(cli_args, "network")?
let eth2_network_config = if cli_args.contains_id("network") {
let network_name = parse_required::<String>(cli_args, "network")?;
Eth2NetworkConfig::constant(network_name.as_str())?.ok_or_else(|| {
format!(
"Invalid network name: '{}'. Use --testnet-dir to specify a custom network.",
network_name
)
})?
} else if cli_args.contains_id("testnet-dir") {
parse_testnet_dir(cli_args, "testnet-dir")?
.ok_or_else(|| "Failed to load testnet directory".to_string())?
} else {
// if neither is present, assume the default network
Eth2NetworkConfig::constant(DEFAULT_HARDCODED_NETWORK)?
.ok_or_else(|| BAD_TESTNET_DIR_MESSAGE.to_string())?
};

let eth2_network_config =
optional_network_config.ok_or_else(|| BAD_TESTNET_DIR_MESSAGE.to_string())?;

Ok(eth2_network_config)
}

Expand Down