diff --git a/Cargo.lock b/Cargo.lock index ea89e7ec2a..61a6d6120e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5772,6 +5772,7 @@ dependencies = [ name = "nym-ip-packet-router" version = "0.1.0" dependencies = [ + "anyhow", "bincode", "bs58 0.5.0", "bytes", diff --git a/service-providers/ip-packet-router/Cargo.toml b/service-providers/ip-packet-router/Cargo.toml index 3029a66a61..f36c7b7ed9 100644 --- a/service-providers/ip-packet-router/Cargo.toml +++ b/service-providers/ip-packet-router/Cargo.toml @@ -9,6 +9,7 @@ edition.workspace = true license.workspace = true [dependencies] +anyhow.workspace = true bincode = "1.3.3" bs58 = { workspace = true } bytes = "1.5.0" diff --git a/service-providers/ip-packet-router/src/main.rs b/service-providers/ip-packet-router/src/main.rs index 0412ea62a9..c8f9fd0e1b 100644 --- a/service-providers/ip-packet-router/src/main.rs +++ b/service-providers/ip-packet-router/src/main.rs @@ -3,7 +3,7 @@ mod cli; #[cfg(target_os = "linux")] #[tokio::main] -async fn main() -> Result<(), nym_ip_packet_router::error::IpPacketRouterError> { +async fn main() -> anyhow::Result<()> { use clap::Parser; let args = cli::Cli::parse(); @@ -14,7 +14,8 @@ async fn main() -> Result<(), nym_ip_packet_router::error::IpPacketRouterError> nym_bin_common::logging::maybe_print_banner(clap::crate_name!(), clap::crate_version!()); } - cli::execute(args).await + cli::execute(args).await?; + Ok(()) } #[cfg(not(target_os = "linux"))] diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index e0aa58d955..63e82dbe58 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -16,6 +16,7 @@ name = "nym_network_requester" path = "src/lib.rs" [dependencies] +anyhow = { workspace = true } addr = "0.15.6" async-trait = { workspace = true } bs58 = { workspace = true } @@ -65,4 +66,3 @@ nym-id = { path = "../../common/nym-id" } [dev-dependencies] tempfile = "3.5.0" -anyhow = { workspace = true } diff --git a/service-providers/network-requester/src/main.rs b/service-providers/network-requester/src/main.rs index 391fe38242..00d62f083b 100644 --- a/service-providers/network-requester/src/main.rs +++ b/service-providers/network-requester/src/main.rs @@ -16,7 +16,7 @@ mod socks5; mod statistics; #[tokio::main] -async fn main() -> Result<(), NetworkRequesterError> { +async fn main() -> anyhow::Result<()> { let args = cli::Cli::parse(); setup_env(args.config_env_file.as_ref()); @@ -25,5 +25,7 @@ async fn main() -> Result<(), NetworkRequesterError> { } setup_logging(); - cli::execute(args).await + cli::execute(args).await?; + + Ok(()) }