diff --git a/sdk/rust/nym-sdk/src/error.rs b/sdk/rust/nym-sdk/src/error.rs index 96b172a51e..6f049ca844 100644 --- a/sdk/rust/nym-sdk/src/error.rs +++ b/sdk/rust/nym-sdk/src/error.rs @@ -139,6 +139,7 @@ pub enum Error { #[error("connect denied: {0:?}")] ConnectDenied(ConnectFailureReason), + #[allow(clippy::result_large_err)] #[error("api directory error: {0}")] GatewayDirectoryError(#[from] NymAPIError), diff --git a/sdk/rust/nym-sdk/src/ip_packet_client/connect.rs b/sdk/rust/nym-sdk/src/ip_packet_client/connect.rs index aa97dd45ff..182fb7660c 100644 --- a/sdk/rust/nym-sdk/src/ip_packet_client/connect.rs +++ b/sdk/rust/nym-sdk/src/ip_packet_client/connect.rs @@ -94,7 +94,7 @@ impl IprClientConnect { let surbs = 20; self.mixnet_sender .send(create_input_message( - Recipient::from(ip_packet_router_address), + ip_packet_router_address, request, surbs, )) diff --git a/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper.rs b/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper.rs index 79d0a92e50..a98ca935bd 100644 --- a/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper.rs +++ b/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper.rs @@ -365,7 +365,7 @@ impl MixStream { debug!("Loading env file: {:?}", env); setup_env(Some(env.clone())); let socket = MixSocket::new(env).await?; - Ok(socket.connect(peer).await?) + socket.connect(peer).await } /// Get the peer's Nym address (like `TcpStream::peer_addr`). diff --git a/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper_ipr.rs b/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper_ipr.rs index 926f3677bd..f4c36e6c31 100644 --- a/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper_ipr.rs +++ b/sdk/rust/nym-sdk/src/stream_wrapper/mixnet_stream_wrapper_ipr.rs @@ -6,7 +6,6 @@ use super::network_env::NetworkEnvironment; use crate::ip_packet_client::{ helpers::check_ipr_message_version, IprListener, MixnetMessageOutcome, }; -use crate::UserAgent; use crate::{mixnet::Recipient, Error}; use std::collections::HashMap; diff --git a/sdk/rust/nym-sdk/src/stream_wrapper/network_env.rs b/sdk/rust/nym-sdk/src/stream_wrapper/network_env.rs index 98d38df1f4..539b1a2982 100644 --- a/sdk/rust/nym-sdk/src/stream_wrapper/network_env.rs +++ b/sdk/rust/nym-sdk/src/stream_wrapper/network_env.rs @@ -1,7 +1,8 @@ use std::path::PathBuf; -#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)] pub enum NetworkEnvironment { + #[default] Mainnet, // Sandbox, } @@ -21,7 +22,7 @@ impl NetworkEnvironment { } } - pub fn from_str(s: &str) -> Result { + pub fn parse_network(s: &str) -> Result { match s.to_lowercase().as_str() { "mainnet" | "main" => Ok(Self::Mainnet), // "sandbox" | "sand" => Ok(Self::Sandbox), @@ -29,9 +30,3 @@ impl NetworkEnvironment { } } } - -impl Default for NetworkEnvironment { - fn default() -> Self { - Self::Mainnet - } -}