Simplify error mapping using a map_err

input-output-hk · Feb 21, 2024 · 92fa5a3 · 92fa5a3
1 parent ae747bd
commit 92fa5a3
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/mithril-aggregator/src/commands/mod.rs b/mithril-aggregator/src/commands/mod.rs
@@ -35,11 +35,8 @@ impl MainCommand {
             Self::Tools(cmd) => cmd.execute(config_builder).await,
             Self::GenerateDoc(cmd) => {
                 let config_infos = vec![Configuration::extract(), DefaultConfiguration::extract()];
-                match cmd.execute_with_configurations(&mut MainOpts::command(), &config_infos) {
-                    Ok(()) => StdResult::Ok(()),
-                    Err(message) => StdResult::Err(anyhow!(message)),
-                }
-                // Ok(cmd.execute_with_configurations(&mut MainOpts::command(), &config_infos)?)
+                cmd.execute_with_configurations(&mut MainOpts::command(), &config_infos)
+                    .map_err(|message| anyhow!(message))
             }
         }
     }

diff --git a/mithril-client-cli/src/main.rs b/mithril-client-cli/src/main.rs
@@ -196,10 +196,9 @@ impl ArtifactCommands {
                     ctx.execute(config_builder).await
                 }
             }
-            Self::GenerateDoc(cmd) => match cmd.execute(&mut Args::command()) {
-                Ok(()) => MithrilResult::Ok(()),
-                Err(message) => MithrilResult::Err(anyhow!(message)),
-            },
+            Self::GenerateDoc(cmd) => cmd
+                .execute(&mut Args::command())
+                .map_err(|message| anyhow!(message)),
         }
     }
 }

diff --git a/mithril-relay/src/commands/relay.rs b/mithril-relay/src/commands/relay.rs
@@ -32,10 +32,9 @@ impl RelayCommands {
             Self::Aggregator(cmd) => cmd.execute(config_builder).await,
             Self::Signer(cmd) => cmd.execute(config_builder).await,
             Self::Passive(cmd) => cmd.execute(config_builder).await,
-            Self::GenerateDoc(cmd) => match cmd.execute(&mut Args::command()) {
-                Ok(()) => StdResult::Ok(()),
-                Err(message) => StdResult::Err(anyhow!(message)),
-            },
+            Self::GenerateDoc(cmd) => cmd
+                .execute(&mut Args::command())
+                .map_err(|message| anyhow!(message)),
         }
     }
 }
diff --git a/mithril-signer/src/main.rs b/mithril-signer/src/main.rs
@@ -105,10 +105,9 @@ async fn main() -> StdResult<()> {
             Configuration::extract(),
             DefaultConfiguration::extract(),
         ];
-        return match cmd.execute_with_configurations(&mut Args::command(), &config_infos) {
-            Ok(()) => StdResult::Ok(()),
-            Err(message) => StdResult::Err(anyhow!(message)),
-        };
+        return cmd
+            .execute_with_configurations(&mut Args::command(), &config_infos)
+            .map_err(|message| anyhow!(message));
     }
 
     #[cfg(feature = "bundle_openssl")]

diff --git a/mithril-test-lab/mithril-end-to-end/src/main.rs b/mithril-test-lab/mithril-end-to-end/src/main.rs
@@ -126,10 +126,9 @@ async fn main() -> StdResult<()> {
     let _guard = slog_scope::set_global_logger(build_logger(&args));
 
     if let Some(EndToEndCommands::GenerateDoc(cmd)) = &args.command {
-        return match cmd.execute(&mut Args::command()) {
-            Ok(()) => StdResult::Ok(()),
-            Err(message) => StdResult::Err(anyhow!(message)),
-        };
+        return cmd
+            .execute(&mut Args::command())
+            .map_err(|message| anyhow!(message));
     }
 
     let server_port = 8080;