Merge pull request #108 from input-output-hk/move_stats_and_qr

Move stats and qr mods from iapyx to catalyst-toolbox

Author: dkijania

Cargo.lock

@@ -59,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" }
+stopwatch = "0.0.7"
 
 [dev-dependencies]
 rand_chacha = "0.3"

catalyst-toolbox/Cargo.toml

@@ -83,7 +83,7 @@ impl Export {
         let reviews = read_vca_reviews_aggregated_file(&from)?;
         match format {
             OutputFormat::Csv => {
-                utils::csv::dump_data_to_csv(&reviews, &to)?;
+                utils::csv::dump_data_to_csv(reviews.iter(), &to)?;
             }
             OutputFormat::Json => {
                 serde_json::to_writer(open_file_write(&Some(to))?, &reviews)?;

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

@@ -3,19 +3,19 @@ use catalyst_toolbox::kedqr::KeyQrCode;
 use catalyst_toolbox::kedqr::QrPin;
 use chain_crypto::AsymmetricKey;
 use chain_crypto::Ed25519Extended;
+use chain_crypto::SecretKey;
 use std::error::Error;
 use std::fs::File;
 use std::io::Write;
+use std::path::Path;
 use std::path::PathBuf;
 
-pub fn secret_from_qr(
+pub fn save_secret_from_qr(
     qr: PathBuf,
     output: Option<PathBuf>,
     pin: QrPin,
 ) -> Result<(), Box<dyn Error>> {
-    let img = image::open(qr)?;
-    let secret = KeyQrCode::decode(img, &pin.password)?;
-    let sk = secret.first().unwrap().clone();
+    let sk = secret_from_qr(&qr, pin)?;
     let hrp = Ed25519Extended::SECRET_BECH32_HRP;
     let secret_key = bech32::encode(hrp, sk.leak_secret().to_base32(), Variant::Bech32)?;
 
@@ -32,3 +32,12 @@ pub fn secret_from_qr(
     };
     Ok(())
 }
+
+pub fn secret_from_qr(
+    qr: impl AsRef<Path>,
+    pin: QrPin,
+) -> Result<SecretKey<Ed25519Extended>, catalyst_toolbox::kedqr::KeyQrCodeError> {
+    let img = image::open(qr)?;
+    let secret = KeyQrCode::decode(img, &pin.password)?;
+    Ok(secret.first().unwrap().clone())
+}

catalyst-toolbox/src/bin/cli/kedqr/decode/img.rs

@@ -1,10 +1,10 @@
-mod hash;
 mod img;
+mod payload;
 
-use crate::cli::kedqr::encode::QrCodeOpts;
+use crate::cli::kedqr::QrCodeOpts;
 use catalyst_toolbox::kedqr::QrPin;
-pub use hash::decode_hash;
-pub use img::secret_from_qr;
+pub use img::{save_secret_from_qr, secret_from_qr};
+pub use payload::{decode_payload, secret_from_payload};
 use std::error::Error;
 use std::path::PathBuf;
 use structopt::StructOpt;
@@ -13,7 +13,7 @@ use structopt::StructOpt;
 #[derive(Debug, PartialEq, StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub struct DecodeQrCodeCmd {
-    /// Path to file containing img or hash.
+    /// Path to file containing img or payload.
     #[structopt(short, long, parse(from_os_str))]
     input: PathBuf,
     /// Path to file to save secret output, if not provided console output will be attempted.
@@ -30,8 +30,8 @@ pub struct DecodeQrCodeCmd {
 impl DecodeQrCodeCmd {
     pub fn exec(self) -> Result<(), Box<dyn Error>> {
         match self.opts {
-            QrCodeOpts::Hash => decode_hash(self.input, self.output, self.pin),
-            QrCodeOpts::Img => secret_from_qr(self.input, self.output, self.pin),
+            QrCodeOpts::Payload => decode_payload(self.input, self.output, self.pin),
+            QrCodeOpts::Img => save_secret_from_qr(self.input, self.output, self.pin),
         }
     }
 }

catalyst-toolbox/src/bin/cli/kedqr/decode/mod.rs

@@ -1,38 +1,20 @@
 use bech32::{ToBase32, Variant};
-use catalyst_toolbox::kedqr::decode;
-use catalyst_toolbox::kedqr::QrPin;
-use chain_crypto::AsymmetricKey;
-use chain_crypto::Ed25519Extended;
-use std::fs::File;
-use std::io::BufRead;
-use std::io::Write;
-use std::{error::Error, fs::OpenOptions, io::BufReader, path::PathBuf};
+use catalyst_toolbox::kedqr::{decode, QrPin};
+use chain_crypto::{AsymmetricKey, Ed25519Extended, SecretKey};
+use std::{
+    error::Error,
+    fs::{File, OpenOptions},
+    io::{BufRead, BufReader, Write},
+    path::{Path, PathBuf},
+};
 
-pub fn decode_hash(
+pub fn decode_payload(
     input: PathBuf,
     output: Option<PathBuf>,
     pin: QrPin,
 ) -> Result<(), Box<dyn Error>> {
-    // open input key and parse it
-    let input = OpenOptions::new()
-        .create(false)
-        .read(true)
-        .write(false)
-        .append(false)
-        .open(&input)
-        .expect("Could not open input file.");
-
-    let mut reader = BufReader::new(input);
-    let mut hash_str = String::new();
-    let _len = reader
-        .read_line(&mut hash_str)
-        .expect("Could not read input file.");
-    hash_str = hash_str.trim_end().to_string();
-
-    // use parsed pin from args
-    let pwd = pin.password;
     // generate qrcode with key and parsed pin
-    let secret = decode(hash_str, &pwd)?;
+    let secret = secret_from_payload(input, pin)?;
     let hrp = Ed25519Extended::SECRET_BECH32_HRP;
     let secret_key = bech32::encode(hrp, secret.leak_secret().to_base32(), Variant::Bech32)?;
     // process output
@@ -49,3 +31,28 @@ pub fn decode_hash(
     }
     Ok(())
 }
+
+pub fn secret_from_payload(
+    input: impl AsRef<Path>,
+    pin: QrPin,
+) -> Result<SecretKey<Ed25519Extended>, catalyst_toolbox::kedqr::KeyQrCodePayloadError> {
+    let input = OpenOptions::new()
+        .create(false)
+        .read(true)
+        .write(false)
+        .append(false)
+        .open(&input)
+        .expect("Could not open input file.");
+
+    let mut reader = BufReader::new(input);
+    let mut payload_str = String::new();
+    let _len = reader
+        .read_line(&mut payload_str)
+        .expect("Could not read input file.");
+    payload_str = payload_str.trim_end().to_string();
+
+    // use parsed pin from args
+    let pwd = pin.password;
+    // generate qrcode with key and parsed pin
+    decode(payload_str, &pwd)
+}