point chain-libs/chain-wallet-libs and jormungandr branches to catalyst-fund8

Author: dkijania

catalyst-toolbox/src/archive.rs

@@ -1,5 +1,5 @@
 use chain_addr::Discrimination;
-use chain_core::{packer::Codec, property::DeserializeFromSlice};
+use chain_core::{packer::Codec, property::Deserialize};
 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 = DeserializeFromSlice::deserialize_from_slice(&mut codec).unwrap();
+        let block: Block = Block::deserialize(&mut codec).unwrap();
 
         for fragment in block.fragments() {
             if let Fragment::VoteCast(tx) = fragment {

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

@@ -1,8 +1,5 @@
 use catalyst_toolbox::recovery::{Replay, ReplayError};
-use chain_core::{
-    packer::Codec,
-    property::{Deserialize, ReadError},
-};
+use chain_core::{packer::Codec, property::Deserialize};
 use chain_impl_mockchain::block::Block;
 use jcli_lib::utils::{
     output_file::{Error as OutputFileError, OutputFile},
@@ -39,7 +36,7 @@ pub enum Error {
     Block0Unavailable,
 
     #[error("Could not load block0")]
-    Block0Loading(#[source] ReadError),
+    Block0Loading(#[source] std::io::Error),
 }
 
 /// Recover the tally from fragment log files and the initial preloaded block0 binary file.
@@ -71,6 +68,7 @@ pub struct ReplayCli {
 
 fn read_block0(path: PathBuf) -> Result<Block, Error> {
     let reader = std::fs::File::open(path)?;
+    let reader = std::io::BufReader::new(reader);
     Block::deserialize(&mut Codec::new(reader)).map_err(Error::Block0Loading)
 }
 

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

@@ -104,6 +104,7 @@ impl VotesPrintout {
 
         stderrlog::new().verbosity(verbose).init().unwrap();
         let reader = std::fs::File::open(block0_path)?;
+        let reader = std::io::BufReader::new(reader);
         let block0 = Block::deserialize(&mut Codec::new(reader)).unwrap();
 
         let (original, to_filter): (Vec<_>, Vec<_>) =