From 0408fa6fd63e0fa0089228f0f7ff7f29a87c7f00 Mon Sep 17 00:00:00 2001 From: Paul Hauner Date: Wed, 27 Nov 2019 13:47:35 +1100 Subject: [PATCH] Make CLI args more consistent --- lcli/src/deploy_deposit_contract.rs | 4 ++-- lcli/src/main.rs | 8 ++++---- lcli/src/refund_deposit_contract.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lcli/src/deploy_deposit_contract.rs b/lcli/src/deploy_deposit_contract.rs index 40ef1ca90c..d039f8e875 100644 --- a/lcli/src/deploy_deposit_contract.rs +++ b/lcli/src/deploy_deposit_contract.rs @@ -39,8 +39,8 @@ pub fn run(mut env: Environment, matches: &ArgMatches) -> Result< let password = parse_password(matches)?; let endpoint = matches - .value_of("endpoint") - .ok_or_else(|| "Endpoint not specified")?; + .value_of("eth1-endpoint") + .ok_or_else(|| "eth1-endpoint not specified")?; let (_event_loop, transport) = Http::new(&endpoint).map_err(|e| { format!( diff --git a/lcli/src/main.rs b/lcli/src/main.rs index 1560759515..2999b2cfa9 100644 --- a/lcli/src/main.rs +++ b/lcli/src/main.rs @@ -135,9 +135,9 @@ fn main() { .help("The MIN_GENESIS_TIME constant."), ) .arg( - Arg::with_name("endpoint") + Arg::with_name("eth1-endpoint") .short("e") - .long("endpoint") + .long("eth1-endpoint") .value_name("HTTP_SERVER") .takes_value(true) .default_value("http://localhost:8545") @@ -173,9 +173,9 @@ fn main() { .help("The testnet dir. Defaults to ~/.lighthouse/testnet"), ) .arg( - Arg::with_name("endpoint") + Arg::with_name("eth1-endpoint") .short("e") - .long("endpoint") + .long("eth1-endpoint") .value_name("HTTP_SERVER") .takes_value(true) .default_value("http://localhost:8545") diff --git a/lcli/src/refund_deposit_contract.rs b/lcli/src/refund_deposit_contract.rs index 64bb9dcc1b..21e5452ea1 100644 --- a/lcli/src/refund_deposit_contract.rs +++ b/lcli/src/refund_deposit_contract.rs @@ -18,8 +18,8 @@ pub const DEPOSIT_ROOT_FN_SIGNATURE: &[u8] = &[0xcf, 0x7a, 0x89, 0x65]; pub fn run(mut env: Environment, matches: &ArgMatches) -> Result<(), String> { let endpoint = matches - .value_of("endpoint") - .ok_or_else(|| "Endpoint not specified")?; + .value_of("eth1-endpoint") + .ok_or_else(|| "eth1-endpoint not specified")?; let account_index = matches .value_of("account-index")