diff --git a/common/client-core/src/client/base_client/mod.rs b/common/client-core/src/client/base_client/mod.rs index 9652601e7a..2edffec2f5 100644 --- a/common/client-core/src/client/base_client/mod.rs +++ b/common/client-core/src/client/base_client/mod.rs @@ -37,7 +37,6 @@ use crate::init::{ }; use futures::channel::mpsc; use futures::SinkExt; -// use log::*; use nym_bandwidth_controller::BandwidthController; use nym_client_core_config_types::{ForgetMe, RememberMe}; use nym_client_core_gateways_storage::{GatewayDetails, GatewaysDetailsStore}; @@ -68,9 +67,7 @@ use std::os::raw::c_int as RawFd; use std::path::Path; use std::sync::Arc; use time::OffsetDateTime; -use tokio::sync::mpsc::Sender; use tokio_util::sync::{PollSendError, PollSender}; -// use tracing::*; use tracing::{debug, error, info}; use url::Url; diff --git a/common/task/src/connections.rs b/common/task/src/connections.rs index 0bc1921438..d0e0c4c269 100644 --- a/common/task/src/connections.rs +++ b/common/task/src/connections.rs @@ -3,10 +3,7 @@ use futures::channel::mpsc; use serde::{Deserialize, Serialize}; -use std::{ - collections::HashMap, - time::{Duration, Instant}, -}; +use std::collections::HashMap; // const LANE_CONSIDERED_CLEAR: usize = 10; diff --git a/nym-gateway-directory/src/entries/auth_addresses.rs b/nym-gateway-directory/src/entries/auth_addresses.rs index 8f8fde3c0e..388ee041cb 100644 --- a/nym-gateway-directory/src/entries/auth_addresses.rs +++ b/nym-gateway-directory/src/entries/auth_addresses.rs @@ -1,9 +1,7 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -// use nym_sdk::mixnet::Recipient; use nym_sphinx::addressing::clients::Recipient; -use nym_sphinx::addressing::nodes::NodeIdentity; use crate::{Error, error::Result}; diff --git a/nym-gateway-directory/src/entries/entry_point.rs b/nym-gateway-directory/src/entries/entry_point.rs index df8adb61d7..e85a7e905a 100644 --- a/nym-gateway-directory/src/entries/entry_point.rs +++ b/nym-gateway-directory/src/entries/entry_point.rs @@ -1,10 +1,9 @@ // Copyright 2023 - Nym Technologies SA // SPDX-License-Identifier: GPL-3.0-only -use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::addressing::nodes::NodeIdentity; use std::fmt::{Display, Formatter}; -// use nym_sdk::mixnet::NodeIdentity; + use serde::{Deserialize, Serialize}; use tracing::debug; diff --git a/nym-gateway-directory/src/gateway_cache.rs b/nym-gateway-directory/src/gateway_cache.rs index 41e2fca5d1..e0afa31288 100644 --- a/nym-gateway-directory/src/gateway_cache.rs +++ b/nym-gateway-directory/src/gateway_cache.rs @@ -8,8 +8,6 @@ use std::{ }; use nym_offline_monitor::ConnectivityHandle; -// use nym_sdk::mixnet::NodeIdentity; -use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::addressing::nodes::NodeIdentity; use strum::IntoEnumIterator; use tokio::task::JoinHandle; diff --git a/nym-gateway-directory/src/lib.rs b/nym-gateway-directory/src/lib.rs index 94e5d19c05..661a1d40ec 100644 --- a/nym-gateway-directory/src/lib.rs +++ b/nym-gateway-directory/src/lib.rs @@ -6,8 +6,6 @@ mod error; pub mod gateway_cache; mod gateway_client; mod helpers; -use nym_sphinx::addressing::clients::Recipient; -use nym_sphinx::addressing::nodes::NodeIdentity; pub use nym_vpn_api_client::types::{GatewayMinPerformance, NaiveFloat, Percent}; pub use crate::{ diff --git a/nym-ip-packet-client/Cargo.toml b/nym-ip-packet-client/Cargo.toml index 062c2748c3..fce758cdeb 100644 --- a/nym-ip-packet-client/Cargo.toml +++ b/nym-ip-packet-client/Cargo.toml @@ -16,7 +16,6 @@ workspace = true bincode.workspace = true bytes.workspace = true futures.workspace = true -# nym-gateway-directory = { path = "../nym-gateway-directory" } nym-ip-packet-requests = { path = "../common/ip-packet-requests" } nym-sdk = {path = "../sdk/rust/nym-sdk" } thiserror.workspace = true diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index f1df14dbac..a949b0ffc5 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -70,6 +70,7 @@ tempfile = { workspace = true } nym-ip-packet-requests = { path = "../../../common/ip-packet-requests" } + # tcpproxy dependencies clap = { workspace = true, features = ["derive"] } anyhow.workspace = true diff --git a/sdk/rust/nym-sdk/src/error.rs b/sdk/rust/nym-sdk/src/error.rs index 26d42892f3..5b8e99f446 100644 --- a/sdk/rust/nym-sdk/src/error.rs +++ b/sdk/rust/nym-sdk/src/error.rs @@ -1,8 +1,6 @@ use nym_validator_client::nyxd::error::NyxdError; use std::path::PathBuf; -use crate::error; - use nym_ip_packet_requests::v8::response::{ConnectFailureReason, IpPacketResponseData}; /// Top-level Error enum for the mixnet client and its relevant types. diff --git a/sdk/rust/nym-sdk/src/mixnet/native_client.rs b/sdk/rust/nym-sdk/src/mixnet/native_client.rs index 49c3ac7a14..843ac9a0b1 100644 --- a/sdk/rust/nym-sdk/src/mixnet/native_client.rs +++ b/sdk/rust/nym-sdk/src/mixnet/native_client.rs @@ -32,7 +32,7 @@ use std::task::{Context, Poll}; use std::time::Duration; use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tokio::sync::RwLockReadGuard; -use tokio_util::codec::{Encoder, FramedRead, FramedWrite}; +use tokio_util::codec::{Encoder, FramedRead}; use tokio_util::sync::CancellationToken; /// Client connected to the Nym mixnet. 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 3163950764..d8ef50a73c 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 @@ -9,7 +9,6 @@ use crate::UserAgent; use crate::{mixnet::Recipient, Error}; use bytes::Bytes; -use bytes::BytesMut; use nym_gateway_directory::{ Config as GatewayConfig, GatewayClient, GatewayType, IpPacketRouterAddress, }; @@ -27,9 +26,9 @@ use std::io; use std::pin::Pin; use std::task::{Context, Poll}; use std::time::Duration; -use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, ReadBuf}; +use tokio::io::{AsyncRead, AsyncWrite, ReadBuf}; use tokio::sync::oneshot; -use tokio_util::codec::{Decoder, FramedRead}; +use tokio_util::codec::FramedRead; use tracing::{debug, error, info}; const IPR_CONNECT_TIMEOUT: Duration = Duration::from_secs(60);