From 80b6ad12dfb528f501e5d8b9a36391918cddf2c4 Mon Sep 17 00:00:00 2001 From: schaeff Date: Tue, 14 Feb 2023 16:23:36 +0100 Subject: [PATCH] clean --- zokrates_cli/src/ops/nova/mod.rs | 3 ++- zokrates_cli/src/ops/nova/prove.rs | 20 -------------------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/zokrates_cli/src/ops/nova/mod.rs b/zokrates_cli/src/ops/nova/mod.rs index 4d39e415..eeaf3433 100644 --- a/zokrates_cli/src/ops/nova/mod.rs +++ b/zokrates_cli/src/ops/nova/mod.rs @@ -1,10 +1,11 @@ -use clap::{App, ArgMatches, SubCommand}; +use clap::{App, ArgMatches, SubCommand, AppSettings}; pub mod prove; pub fn subcommand() -> App<'static, 'static> { SubCommand::with_name("nova") .about("Nova IVC") + .setting(AppSettings::SubcommandRequiredElseHelp) .subcommands(vec![prove::subcommand().display_order(1)]) } diff --git a/zokrates_cli/src/ops/nova/prove.rs b/zokrates_cli/src/ops/nova/prove.rs index 096e6aeb..62d80a76 100644 --- a/zokrates_cli/src/ops/nova/prove.rs +++ b/zokrates_cli/src/ops/nova/prove.rs @@ -46,17 +46,6 @@ pub fn subcommand() -> App<'static, 'static> { .required(false) .default_value(cli_constants::ABI_SPEC_DEFAULT_PATH) ) - .arg( - Arg::with_name("arguments") - .short("a") - .long("arguments") - .help("Arguments for the program's main function, when not using ABI encoding. Expects a space-separated list of field elements like `-a 1 2 3`") - .takes_value(true) - .multiple(true) // allows multiple values - .required(false) - .conflicts_with("abi") - .conflicts_with("stdin") - ) .arg( Arg::with_name("proof-path") .short("j") @@ -67,13 +56,6 @@ pub fn subcommand() -> App<'static, 'static> { .required(false) .default_value(cli_constants::JSON_PROOF_PATH), ) - .arg( - Arg::with_name("stdin") - .long("stdin") - .help("Read arguments from stdin") - .conflicts_with("arguments") - .required(false) - ) } pub fn exec(sub_matches: &ArgMatches) -> Result<(), String> { @@ -121,8 +103,6 @@ fn cli_nova_prove_step<'ast, T: NovaField, I: Iterator = { let path = Path::new(sub_matches.value_of("steps").unwrap()); let json_str = std::fs::read_to_string(path).unwrap();