fix build

Author: oldGreg5

src/jormungandr/jormungandr/src/blockchain/tip.rs

@@ -93,7 +93,7 @@ impl TipUpdater {
         while let Some(block) = stream.next().await {
             let block = block?;
             let fragment_ids = block.fragments().map(|f| f.id()).collect();
-            self.try_request_fragment_removal(fragment_ids, block.header())?;
+            self.try_request_fragment_removal(fragment_ids, block.header()).map_err(|e| Error::from(*e))?;
         }
 
         self.blockchain
@@ -116,7 +116,7 @@ impl TipUpdater {
             .put_tag(MAIN_BRANCH_TAG, candidate_hash)?;
 
         let fragment_ids = block.fragments().map(|f| f.id()).collect();
-        self.try_request_fragment_removal(fragment_ids, block.header())?;
+        self.try_request_fragment_removal(fragment_ids, block.header()).map_err(|e| Error::from(*e))?;
 
         self.tip.update_ref(candidate).await;
         Ok(())
@@ -187,7 +187,7 @@ impl TipUpdater {
         &mut self,
         fragment_ids: Vec<FragmentId>,
         header: &Header,
-    ) -> Result<(), async_msg::TrySendError<TransactionMsg>> {
+    ) -> Result<(), Box<async_msg::TrySendError<TransactionMsg>>> {
         if let Some(ref mut mbox) = self.fragment_mbox {
             let hash = header.hash().into();
             let date = header.block_date();

src/jormungandr/jormungandr/src/rest/v0/logic.rs

@@ -164,7 +164,7 @@ pub async fn post_message(
         fail_fast: true,
         reply_handle,
     };
-    context.try_full()?.transaction_task.clone().try_send(msg)?;
+    context.try_full()?.transaction_task.clone().try_send(msg).map_err(|e| Error::TxMsgSendError(Box::new(e)))?;
     let reply = reply_future.await?;
     if reply.is_error() {
         Err(Error::Fragment(reply))

src/jormungandr/jormungandr/src/rest/v1/logic.rs

@@ -103,7 +103,7 @@ pub async fn post_fragments(
         fail_fast: batch.fail_fast,
         reply_handle,
     };
-    msgbox.try_send(msg)?;
+    msgbox.try_send(msg).map_err(|e| Error::TxMsgSend(Box::new(e)))?;
     let reply = reply_future.await?;
     if reply.is_error() {
         Err(Error::Fragments(reply))

src/jormungandr/testing/mjolnir/src/mjolnir_lib/bootstrap/mod.rs

@@ -10,12 +10,11 @@ use std::path::PathBuf;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
-#[allow(clippy::large_enum_variant)]
 pub enum ClientLoadCommandError {
     #[error("No scenario defined for run. Available: [duration,iteration]")]
     NoScenarioDefined,
     #[error("Client Error")]
-    ClientError(#[from] MjolnirError),
+    ClientError(#[from] Box<MjolnirError>),
 }
 
 #[derive(Parser, Debug)]
@@ -61,7 +60,7 @@ impl ClientLoadCommand {
 
         let config = self.build_config();
 
-        Ok(PassiveBootstrapLoad::new(config).exec(scenario_type.unwrap())?)
+        PassiveBootstrapLoad::new(config).exec(scenario_type.unwrap()).map_err(|e| ClientLoadCommandError::ClientError(Box::new(e)))
     }
 
     fn get_block0_hash(&self) -> Hash {

src/jormungandr/testing/mjolnir/src/mjolnir_lib/error.rs

@@ -5,7 +5,6 @@ use jormungandr_automation::{
 use thiserror::Error;
 
 #[derive(Error, Debug)]
-#[allow(clippy::large_enum_variant)]
 pub enum MjolnirError {
     #[error("cannot query rest")]
     RestError(#[from] RestError),
@@ -18,5 +17,5 @@ pub enum MjolnirError {
     #[error("pace is too low ({0})")]
     PaceTooLow(u64),
     #[error("get block0 error")]
-    Block0Error(#[from] Block0Error),
+    Block0Error(#[from] Box<Block0Error>),
 }

src/jormungandr/testing/mjolnir/src/mjolnir_lib/explorer.rs

@@ -11,7 +11,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub enum ExplorerLoadCommandError {
     #[error("Client Error")]
-    ClientError(#[from] MjolnirError),
+    ClientError(#[from] Box<MjolnirError>),
 }
 
 #[derive(Parser, Debug)]

src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/batch/adversary/votes_only.rs

@@ -80,7 +80,7 @@ impl VotesOnly {
             Some(self.faucet_spending_counter.into()),
             Discrimination::from_testing_bool(self.testing),
         );
-        let block0 = get_block(&self.block0_path)?;
+        let block0 = get_block(&self.block0_path).map_err(|e| MjolnirError::Block0Error(Box::new(e)))?;
         let vote_plans = block0.vote_plans();
 
         let remote_jormungandr = RemoteJormungandrBuilder::new("node".to_owned())

src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/mod.rs

@@ -18,7 +18,7 @@ pub enum FragmentLoadCommand {
 #[derive(Error, Debug)]
 pub enum FragmentLoadCommandError {
     #[error("Client Error")]
-    ClientError(#[from] MjolnirError),
+    ClientError(#[from] Box<MjolnirError>),
 }
 
 impl FragmentLoadCommand {

src/jormungandr/testing/mjolnir/src/mjolnir_lib/fragment/standard/adversary/votes_only.rs

@@ -80,7 +80,7 @@ impl VotesOnly {
             Some(self.faucet_spending_counter.into()),
             Discrimination::from_testing_bool(self.testing),
         );
-        let block0 = get_block(&self.block0_path)?;
+        let block0 = get_block(&self.block0_path).map_err(|e| MjolnirError::Block0Error(Box::new(e)))?;
         let vote_plans = block0.vote_plans();
 
         let remote_jormungandr = RemoteJormungandrBuilder::new("node".to_owned())

src/jormungandr/testing/mjolnir/src/mjolnir_lib/rest.rs

@@ -11,7 +11,7 @@ use thiserror::Error;
 #[derive(Error, Debug)]
 pub enum RestLoadCommandError {
     #[error("Client Error")]
-    ClientError(#[from] MjolnirError),
+    ClientError(#[from] Box<MjolnirError>),
 }
 
 #[derive(Parser, Debug)]