3/4 of thiserrors done

Author: cameron1024

catalyst-toolbox/src/archive.rs

@@ -3,6 +3,7 @@ use chain_core::{packer::Codec, property::DeserializeFromSlice};
 use chain_impl_mockchain::{
     block::Block, chaintypes::HeaderId, fragment::Fragment, transaction::InputEnum,
 };
+use color_eyre::{eyre::bail, Report};
 use jormungandr_lib::interfaces::{AccountIdentifier, Address};
 
 use serde::Serialize;
@@ -11,21 +12,6 @@ use std::{collections::HashMap, path::Path};
 
 const MAIN_TAG: &str = "HEAD";
 
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error(transparent)]
-    Storage(#[from] chain_storage::Error),
-
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-
-    #[error(transparent)]
-    Csv(#[from] csv::Error),
-
-    #[error("Only accounts inputs are supported not Utxos")]
-    UnhandledInput,
-}
-
 #[derive(Serialize)]
 struct Vote {
     fragment_id: String,
@@ -36,7 +22,10 @@ struct Vote {
     raw_fragment: String,
 }
 
-pub fn generate_archive_files(jormungandr_database: &Path, output_dir: &Path) -> Result<(), Error> {
+pub fn generate_archive_files(
+    jormungandr_database: &Path,
+    output_dir: &Path,
+) -> Result<(), Report> {
     let db = chain_storage::BlockStore::file(
         jormungandr_database,
         HeaderId::zero_hash()
@@ -67,7 +56,7 @@ pub fn generate_archive_files(jormungandr_database: &Path, output_dir: &Path) ->
                     AccountIdentifier::from(account_id)
                         .into_address(Discrimination::Production, "ca")
                 } else {
-                    return Err(Error::UnhandledInput);
+                    bail!("unhandled input")
                 };
                 let certificate = tx.as_slice().payload().into_payload();
 

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

@@ -1,5 +1,6 @@
-use catalyst_toolbox::archive::{generate_archive_files, Error};
+use catalyst_toolbox::archive::generate_archive_files;
 
+use color_eyre::Report;
 use structopt::StructOpt;
 
 use std::path::PathBuf;
@@ -14,7 +15,7 @@ pub struct Archive {
 }
 
 impl Archive {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         generate_archive_files(&self.jormungandr_database, &self.output_dir)
     }
 }

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

@@ -1,17 +1,9 @@
 mod compare;
 mod sentry;
 
+use color_eyre::Report;
 use structopt::StructOpt;
 
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    SentryError(#[from] sentry::Error),
-
-    #[error(transparent)]
-    CompareError(#[from] compare::Error),
-}
-
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub enum Logs {
@@ -22,7 +14,7 @@ pub enum Logs {
 }
 
 impl Logs {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             Logs::Sentry(sentry_logs) => sentry_logs.exec()?,
             Logs::Compare(compare) => compare.exec()?,

catalyst-toolbox/src/bin/cli/logs/sentry/download.rs

@@ -1,5 +1,5 @@
-use super::Error;
 use catalyst_toolbox::logs::sentry::{LazySentryLogs, RawLog, SentryLogClient};
+use color_eyre::Report;
 use jcli_lib::utils::io::open_file_write;
 
 use std::path::PathBuf;
@@ -65,7 +65,7 @@ impl FromStr for Mode {
 }
 
 impl Download {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let Self {
             url,
             token,
@@ -132,7 +132,7 @@ fn request_sentry_logs_and_dump_to_file(
     dates: DateFilter,
     out: PathBuf,
     chunk_size: usize,
-) -> Result<(), Error> {
+) -> Result<(), Report> {
     let client = SentryLogClient::new(url, token);
 
     println!("Starting downloading...");
@@ -159,7 +159,7 @@ fn request_sentry_logs_and_dump_to_file(
     Ok(())
 }
 
-fn dump_logs_to_json(logs: &[RawLog], out: PathBuf) -> Result<(), Error> {
+fn dump_logs_to_json(logs: &[RawLog], out: PathBuf) -> Result<(), Report> {
     let file = open_file_write(&Some(out))?;
     serde_json::to_writer_pretty(file, logs)?;
     Ok(())

catalyst-toolbox/src/bin/cli/logs/sentry/mod.rs

@@ -1,22 +1,9 @@
 mod download;
 mod stats;
 
-use catalyst_toolbox::logs::sentry::Error as SentryLogError;
-
+use color_eyre::Report;
 use structopt::StructOpt;
 
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    SentryLog(#[from] SentryLogError),
-
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-
-    #[error(transparent)]
-    Json(#[from] serde_json::Error),
-}
-
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub enum SentryLogs {
@@ -27,7 +14,7 @@ pub enum SentryLogs {
 }
 
 impl SentryLogs {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             SentryLogs::Download(download) => download.exec(),
             SentryLogs::Stats(stats) => stats.exec(),

catalyst-toolbox/src/bin/cli/logs/sentry/stats.rs

@@ -1,7 +1,7 @@
-use super::Error;
 use catalyst_toolbox::logs::sentry::{
     RawLog, RegexMatch, SentryLogsStatChecker, SentryLogsStatsExecutor, Stat,
 };
+use color_eyre::Report;
 use jcli_lib::utils::io::open_file_read;
 
 use regex::Regex;
@@ -77,7 +77,7 @@ impl Stats {
         SentryLogsStatsExecutor::new(checkers)
     }
 
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let mut checker = self.build_checkers();
         let logs_reader = open_file_read(&Some(self.file))?;
         let logs: Vec<RawLog> = serde_json::from_reader(logs_reader)?;

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

@@ -1,18 +1,8 @@
 mod api_params;
 mod send;
 
+use color_eyre::Report;
 use structopt::StructOpt;
-use thiserror::Error;
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("error reading file, source: {0}")]
-    FileError(#[from] std::io::Error),
-
-    #[error(transparent)]
-    NotificationError(#[from] catalyst_toolbox::notifications::Error),
-}
 
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
@@ -21,7 +11,7 @@ pub enum PushNotifications {
 }
 
 impl PushNotifications {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         use self::PushNotifications::*;
         match self {
             Send(cmd) => cmd.exec()?,

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

@@ -1,6 +1,7 @@
 mod tally;
 mod votes;
 
+use color_eyre::Report;
 use structopt::StructOpt;
 
 #[derive(StructOpt)]
@@ -11,7 +12,7 @@ pub enum Recover {
 }
 
 impl Recover {
-    pub fn exec(self) -> Result<(), tally::Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             Recover::Tally(cmd) => cmd.exec(),
             Recover::VotesPrintout(cmd) => cmd.exec(),

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

@@ -1,47 +1,17 @@
-use catalyst_toolbox::recovery::{Replay, ReplayError};
-use chain_core::{
-    packer::Codec,
-    property::{Deserialize, ReadError},
-};
+use catalyst_toolbox::recovery::Replay;
+use chain_core::{packer::Codec, property::Deserialize};
 use chain_impl_mockchain::block::Block;
-use jcli_lib::utils::{
-    output_file::{Error as OutputFileError, OutputFile},
-    output_format::{Error as OutputFormatError, OutputFormat},
+use color_eyre::{
+    eyre::{bail, Context},
+    Report,
 };
+use jcli_lib::utils::{output_file::OutputFile, output_format::OutputFormat};
 
 use std::path::PathBuf;
 
 use reqwest::Url;
 use structopt::StructOpt;
 
-#[allow(clippy::large_enum_variant)]
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    Replay(#[from] ReplayError),
-
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-
-    #[error(transparent)]
-    Request(#[from] reqwest::Error),
-
-    #[error(transparent)]
-    Serialization(#[from] serde_json::Error),
-
-    #[error(transparent)]
-    OutputFile(#[from] OutputFileError),
-
-    #[error(transparent)]
-    OutputFormat(#[from] OutputFormatError),
-
-    #[error("Block0 should be provided either from a path (block0-path) or an url (block0-url)")]
-    Block0Unavailable,
-
-    #[error("Could not load block0")]
-    Block0Loading(#[source] ReadError),
-}
-
 /// Recover the tally from fragment log files and the initial preloaded block0 binary file.
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab")]
@@ -69,18 +39,18 @@ pub struct ReplayCli {
     verbose: usize,
 }
 
-fn read_block0(path: PathBuf) -> Result<Block, Error> {
+fn read_block0(path: PathBuf) -> Result<Block, Report> {
     let reader = std::fs::File::open(path)?;
-    Block::deserialize(&mut Codec::new(reader)).map_err(Error::Block0Loading)
+    Block::deserialize(&mut Codec::new(reader)).context("block0 loading")
 }
 
-fn load_block0_from_url(url: Url) -> Result<Block, Error> {
+fn load_block0_from_url(url: Url) -> Result<Block, Report> {
     let block0_body = reqwest::blocking::get(url)?.bytes()?;
-    Block::deserialize(&mut Codec::new(&block0_body[..])).map_err(Error::Block0Loading)
+    Block::deserialize(&mut Codec::new(&block0_body[..])).context("block0 loading")
 }
 
 impl ReplayCli {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let Self {
             block0_path,
             block0_url,
@@ -96,7 +66,7 @@ impl ReplayCli {
         } else if let Some(url) = block0_url {
             load_block0_from_url(url)?
         } else {
-            return Err(Error::Block0Unavailable);
+            bail!("block0 unavailable");
         };
 
         let replay = Replay::new(block0, logs_path, output, output_format);

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

@@ -1,4 +1,3 @@
-use super::tally::Error;
 use catalyst_toolbox::recovery::tally::{
     deconstruct_account_transaction, ValidatedFragment, ValidationError, VoteFragmentFilter,
 };
@@ -9,6 +8,7 @@ use chain_core::{
 use chain_impl_mockchain::{
     account::SpendingCounter, block::Block, fragment::Fragment, vote::Payload,
 };
+use color_eyre::Report;
 use jcli_lib::utils::{output_file::OutputFile, output_format::OutputFormat};
 use jormungandr_lib::interfaces::load_persistent_fragments_logs_from_folder_path;
 use serde::Serialize;
@@ -93,7 +93,7 @@ struct RecoveredVotes {
 }
 
 impl VotesPrintout {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let VotesPrintout {
             block0_path,
             logs_path,