rebase

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

@@ -1,5 +1,5 @@
 use chain_addr::Discrimination;
-use chain_core::{packer::Codec, property::Deserialize};
+use chain_core::{packer::Codec, property::DeserializeFromSlice};
 use chain_impl_mockchain::{
     block::Block, chaintypes::HeaderId, fragment::Fragment, transaction::InputEnum,
 };
@@ -56,7 +56,7 @@ pub fn generate_archive_files(jormungandr_database: &Path, output_dir: &Path) ->
     for iter_res in block_iter {
         let block_bin = iter_res?;
         let mut codec = Codec::new(block_bin.as_ref());
-        let block: Block = Block::deserialize(&mut codec).unwrap();
+        let block: Block = DeserializeFromSlice::deserialize_from_slice(&mut codec).unwrap();
 
         for fragment in block.fragments() {
             if let Fragment::VoteCast(tx) = fragment {

catalyst-toolbox/src/archive.rs

@@ -2,14 +2,11 @@ use super::QrCodeOpts;
 use crate::cli::kedqr::decode::{secret_from_payload, secret_from_qr};
 use catalyst_toolbox::kedqr::QrPin;
 use chain_addr::{AddressReadable, Discrimination, Kind};
-use chain_core::{
-    mempack::{ReadBuf, Readable},
-    property::Deserialize,
-};
+use chain_core::property::Deserialize;
 use chain_crypto::{Ed25519Extended, SecretKey};
 use chain_impl_mockchain::block::Block;
+use chain_ser::packer::Codec;
 use jormungandr_lib::interfaces::{Block0Configuration, Initial};
-use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use structopt::StructOpt;
 use url::Url;
@@ -55,12 +52,11 @@ impl InfoForQrCodeCmd {
                         .read(true)
                         .append(false)
                         .open(block0_path)?;
-                    let reader = BufReader::new(reader);
-                    Block::deserialize(reader)?
+                    Block::deserialize(&mut Codec::new(reader))?
                 } else if Url::parse(block0_path).is_ok() {
                     let response = reqwest::blocking::get(block0_path)?;
                     let block0_bytes = response.bytes()?.to_vec();
-                    Block::read(&mut ReadBuf::from(&block0_bytes))?
+                    Block::deserialize(&mut Codec::new(&block0_bytes[..]))?
                 } else {
                     panic!("invalid block0: should be either path to filesystem or url ");
                 }