feat: upgrade simulation to a CLI (#58)

Manta-Network · Jun 2, 2022 · 743853c · 743853c
1 parent 8c32882
commit 743853c
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 19 deletions.
diff --git a/manta-pay/Cargo.toml b/manta-pay/Cargo.toml
@@ -34,7 +34,7 @@ required-features = ["groth16", "manta-crypto/getrandom", "test"]
 
 [[bin]]
 name = "simulation"
-required-features = ["groth16", "simulation"]
+required-features = ["clap", "groth16", "simulation"]
 
 [features]
 # Enable Arkworks Backend
@@ -117,6 +117,7 @@ ark-std = { version = "0.3.0", optional = true, default-features = false }
 bip32 = { version = "0.3.0", optional = true, default-features = false, features = ["bip39", "secp256k1"] }
 blake2 = { version = "0.10.4", default-features = false }
 bs58 = { version = "0.4.0", optional = true, default-features = false, features = ["alloc"] }
+clap = { version = "3.1.15", optional = true, default-features = false, features = ["color", "derive", "std", "suggestions", "unicode", "wrap_help"] }
 derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
 futures = { version = "0.3.21", optional = true, default-features = false }
 indexmap = { version = "1.8.0", optional = true, default-features = false }

diff --git a/manta-pay/src/bin/simulation.rs b/manta-pay/src/bin/simulation.rs
@@ -16,16 +16,14 @@
 
 //! Manta Pay Simulation
 
-// TODO: Add CLI interface and configuration for simulation parameters. See the old simulation code
-//       `test/simulation/mod.rs` for more information.
-
+use clap::{error::ErrorKind, CommandFactory, Parser};
 use manta_accounting::transfer::canonical::generate_context;
 use manta_crypto::rand::{OsRng, Rand};
 use manta_pay::{config::FullParameters, simulation::Simulation};
 
 /// Runs the Manta Pay simulation.
-#[tokio::main(flavor = "multi_thread", worker_threads = 4)]
-pub async fn main() {
+pub fn main() {
+    let simulation = Simulation::parse();
     let mut rng = OsRng;
     let parameters = rng.gen();
     let utxo_accumulator_model = rng.gen();
@@ -35,18 +33,26 @@ pub async fn main() {
         &mut rng,
     )
     .expect("Failed to generate contexts.");
-    Simulation {
-        actor_count: 10,
-        actor_lifetime: 10,
-        asset_id_count: 3,
-        starting_balance: 1000000,
+    match tokio::runtime::Builder::new_multi_thread()
+        .worker_threads(4)
+        .build()
+    {
+        Ok(runtime) => runtime.block_on(async {
+            simulation
+                .run(
+                    &parameters,
+                    &utxo_accumulator_model,
+                    &proving_context,
+                    verifying_context,
+                    &mut rng,
+                )
+                .await
+        }),
+        Err(err) => Simulation::command()
+            .error(
+                ErrorKind::Io,
+                format_args!("Unable to start `tokio` runtime: {}", err),
+            )
+            .exit(),
     }
-    .run(
-        &parameters,
-        &utxo_accumulator_model,
-        &proving_context,
-        verifying_context,
-        &mut rng,
-    )
-    .await
 }
diff --git a/manta-pay/src/simulation/mod.rs b/manta-pay/src/simulation/mod.rs
@@ -65,6 +65,7 @@ where
 }
 
 /// Simulation Configuration
+#[cfg_attr(feature = "clap", derive(clap::Parser))]
 #[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
 pub struct Simulation {
     /// Actor Count