merge main

Author: cameron1024

Cargo.lock

@@ -45,7 +45,6 @@ regex = "1.5"
 serde = "1.0"
 serde_json = "1.0"
 structopt = "0.3"
-stderrlog = "0.5"
 serde_yaml = "0.8.17"
 sscanf = "0.1"
 color-eyre = "0.6"
@@ -60,6 +59,7 @@ symmetric-cipher = { git = "https://github.com/input-output-hk/chain-wallet-libs
 graphql_client = "0.10"
 gag = "1"
 vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "master" }
+env_logger = "0.9"
 
 [dev-dependencies]
 rand_chacha = "0.3"

catalyst-toolbox/Cargo.toml

@@ -3,6 +3,7 @@ use structopt::StructOpt;
 pub mod cli;
 
 fn main() -> color_eyre::Result<()> {
+    env_logger::try_init()?;
     color_eyre::install()?;
     cli::Cli::from_args().exec()?;
     Ok(())

catalyst-toolbox/src/bin/catalyst-toolbox.rs

@@ -19,3 +19,18 @@ impl Recover {
         }
     }
 }
+
+fn set_verbosity(verbosity: usize) {
+    if verbosity > 0 {
+        std::env::set_var(
+            "RUST_LOG",
+            match verbosity {
+                0 => unreachable!(),
+                1 => "warn",
+                2 => "info",
+                3 => "debug",
+                _ => "trace",
+            },
+        )
+    }
+}

catalyst-toolbox/src/bin/cli/recovery/mod.rs

@@ -12,6 +12,8 @@ use std::path::PathBuf;
 use reqwest::Url;
 use structopt::StructOpt;
 
+use super::set_verbosity;
+
 /// Recover the tally from fragment log files and the initial preloaded block0 binary file.
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab")]
@@ -59,7 +61,8 @@ impl ReplayCli {
             output_format,
             verbose,
         } = self;
-        stderrlog::new().verbosity(verbose).init().unwrap();
+
+        set_verbosity(verbose);
 
         let block0 = if let Some(path) = block0_path {
             read_block0(path)?

catalyst-toolbox/src/bin/cli/recovery/tally.rs

@@ -18,6 +18,8 @@ use std::iter::IntoIterator;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
+use super::set_verbosity;
+
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub struct VotesPrintout {
@@ -102,7 +104,8 @@ impl VotesPrintout {
             verbose,
         } = self;
 
-        stderrlog::new().verbosity(verbose).init().unwrap();
+        set_verbosity(verbose);
+
         let reader = std::fs::File::open(block0_path)?;
         let block0 = Block::deserialize(&mut Codec::new(reader)).unwrap();