Merge pull request #553 from input-output-hk/greg/541/version_api

Add version information

Author: ghubertpalo

Cargo.lock

@@ -9,7 +9,7 @@ base64 = "0.13.0"
 clap = { version = "3.1.6", features = ["derive"] }
 hex = "0.4.3"
 log = "0.4.14"
-mithril-common = { path = "../../mithril-common", features = ["allow_skip_signer_certification"]}
+mithril-common = { path = "../../mithril-common", features = ["allow_skip_signer_certification"] }
 rand_chacha = "0.3.1"
 rand_core   = "0.6.3"
 serde = { version = "1.0", features = ["derive"] }

demo/protocol-demo/Cargo.toml

@@ -8,7 +8,7 @@ description = "A Mithril Aggregator server"
 [dependencies]
 async-trait = "0.1.52"
 chrono = "0.4"
-clap = { version = "3.1.6", features = ["derive", "env"] }
+clap = { version = "4.0", features = ["derive", "env", "cargo"] }
 cloud-storage = "0.11.0"
 config = "0.13.1"
 flate2 = "1.0.23"
@@ -30,7 +30,7 @@ warp = "0.3"
 
 [dev-dependencies]
 httpmock = "0.6.6"
-mithril-common = { path = "../mithril-common", features = ["test_only"]}
+mithril-common = { path = "../mithril-common", features = ["test_only"] }
 mockall = "0.11.0"
 slog-term = "2.9.0"
 tempfile = "3.3.0"

mithril-aggregator/Cargo.toml

@@ -137,6 +137,7 @@ async fn do_first_launch_initialization_if_needed(
 
 /// Mithril Aggregator Node
 #[derive(Parser, Debug, Clone)]
+#[command(version)]
 pub struct MainOpts {
     /// application main command
     #[clap(subcommand)]
@@ -147,8 +148,8 @@ pub struct MainOpts {
     pub run_mode: String,
 
     /// Verbosity level
-    #[clap(short, long, parse(from_occurrences))]
-    pub verbose: usize,
+    #[clap(short, long, action = clap::ArgAction::Count)]
+    pub verbose: u8,
 
     /// Directory of the Cardano node files
     #[clap(long)]

mithril-aggregator/src/command_args.rs

@@ -7,7 +7,7 @@ description = "A Mithril Client"
 
 [dependencies]
 async-trait = "0.1.52"
-clap = { version = "3.1.6", features = ["derive", "env"] }
+clap = { version = "4.0", features = ["derive", "env"] }
 cli-table = "0.4"
 config = "0.13.1"
 flate2 = "1.0.23"
@@ -27,7 +27,7 @@ tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 httpmock = "0.6.6"
-mithril-common = { path = "../mithril-common", features = ["test_only"]}
+mithril-common = { path = "../mithril-common", features = ["test_only"] }
 mockall = "0.11.0"
 
 [features]

mithril-client/Cargo.toml

@@ -18,6 +18,7 @@ use mithril_client::commands::{DownloadCommand, ListCommand, RestoreCommand, Sho
     about = "This program downloads, checks and restores certified blockchain snapshots.",
     long_about = None
 )]
+#[command(version)]
 pub struct Args {
     /// Available commands
     #[clap(subcommand)]
@@ -28,8 +29,8 @@ pub struct Args {
     run_mode: String,
 
     /// Verbosity level (-v=warning, -vv=info, -vvv=debug).
-    #[clap(short, long, parse(from_occurrences))]
-    verbose: usize,
+    #[clap(short, long, action = clap::ArgAction::Count)]
+    verbose: u8,
 
     /// Directory where configuration file is located.
     #[clap(long, default_value = "./config")]

mithril-client/src/main.rs

@@ -7,7 +7,7 @@ description = "A Mithril Signer"
 
 [dependencies]
 async-trait = "0.1.52"
-clap = { version = "3.1.6", features = ["derive", "env"] }
+clap = { version = "4.0", features = ["derive", "env"] }
 config = "0.13.1"
 hex = "0.4.3"
 mithril-common = { path = "../mithril-common" }
@@ -25,7 +25,7 @@ tokio = { version = "1.17.0", features = ["full"] }
 
 [dev-dependencies]
 httpmock = "0.6.6"
-mithril-common = { path = "../mithril-common", features = ["test_only"]}
+mithril-common = { path = "../mithril-common", features = ["test_only"] }
 mockall = "0.11.0"
 slog-term = "2.9.0"
 

mithril-signer/Cargo.toml

@@ -13,6 +13,7 @@ use mithril_signer::{
 #[derive(Parser)]
 #[clap(name = "mithril-signer")]
 #[clap(about = "An implementation of a Mithril Signer", long_about = None)]
+#[command(version)]
 pub struct Args {
     /// Run Mode
     #[clap(short, long, env("RUN_MODE"), default_value = "dev")]
@@ -22,17 +23,17 @@ pub struct Args {
     #[clap(
         short,
         long,
-        parse(from_occurrences),
-        help = "verbosity level, add more v to increase"
+        action = clap::ArgAction::Count,
+        help = "Verbosity level, add more v to increase"
     )]
-    verbose: usize,
+    verbose: u8,
 
     /// Configuration file location
     #[clap(
         short,
         long,
         default_value = "./config",
-        help = "directory where the configuration file is located"
+        help = "Directory where the configuration file is located"
     )]
     configuration_dir: PathBuf,
 }