fix: clap shortcuts

spaceandtimelabs · Nov 4, 2024 · 7a4ef1a · 7a4ef1a
1 parent 0c93930
commit 7a4ef1a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/crates/proof-of-sql/utils/generate-parameters/main.rs b/crates/proof-of-sql/utils/generate-parameters/main.rs
@@ -10,7 +10,7 @@ use proof_of_sql::proof_primitive::dory::{ProverSetup, PublicParameters, Verifie
 use rand_chacha::ChaCha20Rng;
 use sha2::{Digest, Sha256};
 use std::{
-    env, fmt,
+    env,
     fs::{self, File, OpenOptions},
     io::{self, Write},
     path::Path,
@@ -31,7 +31,7 @@ struct Args {
     nu: usize,
 
     /// Mode for generating parameters: "p" for Prover, "v" for Verifier, pv for both
-    #[arg(short, long, default_value = "pv")]
+    #[arg(short, long, default_value = "all")]
     mode: Mode,
 
     /// The initial randomness for the transparent setup
@@ -49,21 +49,9 @@ struct Args {
 // they type "pv"
 #[derive(Debug, Clone, ValueEnum)]
 enum Mode {
-    P,  //Prover
-    V,  //verifier
-    PV, //Both
-}
-
-// Implement Display for Mode
-impl fmt::Display for Mode {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        let mode_str = match self {
-            Mode::P => "P",
-            Mode::V => "V",
-            Mode::PV => "PV",
-        };
-        write!(f, "{mode_str}")
-    }
+    Prover,   //Prover
+    Verifier, //verifier
+    All,      //Both
 }
 
 fn main() {
@@ -117,17 +105,17 @@ fn generate_parameters(args: &Args) {
     spinner.finish_with_message("Public parameter setup complete");
 
     match args.mode {
-        Mode::PV => {
+        Mode::All => {
             println!("Generating parameters for Prover...");
             generate_prover_setup(&public_parameters, args.nu, &args.target);
             println!("Generating parameters for Verifier...");
             generate_verifier_setup(&public_parameters, args.nu, &args.target);
         }
-        Mode::P => {
+        Mode::Prover => {
             println!("Generating parameters for Prover...");
             generate_prover_setup(&public_parameters, args.nu, &args.target);
         }
-        Mode::V => {
+        Mode::Verifier => {
             println!("Generating parameters for Verifier...");
             generate_verifier_setup(&public_parameters, args.nu, &args.target);
         }

diff --git a/crates/proof-of-sql/utils/generate-parameters/round_trip_test.rs b/crates/proof-of-sql/utils/generate-parameters/round_trip_test.rs
@@ -24,7 +24,7 @@ fn we_can_generate_save_and_load_public_setups() {
         .arg("--nu")
         .arg("4")
         .arg("--mode")
-        .arg("pv")
+        .arg("all")
         .arg("--target")
         .arg(temp_path)
         .output()