From 586d5f658b4683ed91e7f0b0c8b86bc8b0c4cf01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Tue, 21 Feb 2023 13:54:27 +0100 Subject: [PATCH] Move client-connections crate to nym-task (#3068) * Move client-connections to nym-task * rustfmt --- Cargo.lock | 14 -------------- Cargo.toml | 1 - clients/client-core/Cargo.toml | 1 - clients/client-core/src/client/base_client/mod.rs | 2 +- clients/client-core/src/client/inbound_messages.rs | 2 +- .../input_message_listener.rs | 2 +- .../retransmission_request_listener.rs | 2 +- .../real_messages_control/message_handler.rs | 2 +- .../src/client/real_messages_control/mod.rs | 2 +- .../real_messages_control/real_traffic_stream.rs | 6 +++--- .../src/client/replies/reply_controller/mod.rs | 2 +- .../client/replies/reply_controller/requests.rs | 2 +- .../client-core/src/client/transmission_buffer.rs | 2 +- clients/native/Cargo.toml | 1 - clients/native/src/client/mod.rs | 2 +- clients/native/src/websocket/handler.rs | 6 +++--- clients/socks5/Cargo.toml | 1 - clients/socks5/src/socks/client.rs | 2 +- clients/socks5/src/socks/server.rs | 2 +- clients/webassembly/Cargo.toml | 1 - clients/webassembly/src/client/mod.rs | 2 +- common/client-connections/Cargo.toml | 10 ---------- common/socks5/proxy-helpers/Cargo.toml | 1 - .../proxy-helpers/src/connection_controller.rs | 2 +- .../proxy-helpers/src/proxy_runner/inbound.rs | 4 ++-- .../socks5/proxy-helpers/src/proxy_runner/mod.rs | 2 +- .../src/lib.rs => task/src/connections.rs} | 0 common/task/src/lib.rs | 1 + nym-connect-android/src-tauri/Cargo.lock | 11 ----------- sdk/rust/nym-sdk/Cargo.toml | 1 - sdk/rust/nym-sdk/src/mixnet/client.rs | 10 ++++++---- service-providers/network-requester/Cargo.toml | 1 - service-providers/network-requester/src/core.rs | 2 +- service-providers/network-requester/src/reply.rs | 2 +- .../network-requester/src/socks5/tcp.rs | 2 +- 35 files changed, 33 insertions(+), 73 deletions(-) delete mode 100644 common/client-connections/Cargo.toml rename common/{client-connections/src/lib.rs => task/src/connections.rs} (100%) diff --git a/Cargo.lock b/Cargo.lock index 549e8ecbca..c46600d2e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -675,20 +675,11 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "client-connections" -version = "0.1.0" -dependencies = [ - "futures", - "log", -] - [[package]] name = "client-core" version = "1.1.9" dependencies = [ "async-trait", - "client-connections", "config", "dashmap 5.4.0", "dirs", @@ -3513,7 +3504,6 @@ name = "nym-client" version = "1.1.9" dependencies = [ "clap 4.1.4", - "client-connections", "client-core", "coconut-interface", "config", @@ -3699,7 +3689,6 @@ version = "1.1.9" dependencies = [ "async-trait", "clap 4.1.4", - "client-connections", "client-core", "config", "dirs", @@ -3775,7 +3764,6 @@ dependencies = [ name = "nym-sdk" version = "0.1.0" dependencies = [ - "client-connections", "client-core", "futures", "gateway-client", @@ -3801,7 +3789,6 @@ name = "nym-socks5-client" version = "1.1.9" dependencies = [ "clap 4.1.4", - "client-connections", "client-core", "coconut-interface", "config", @@ -4613,7 +4600,6 @@ name = "proxy-helpers" version = "0.1.0" dependencies = [ "bytes", - "client-connections", "futures", "log", "nym-task", diff --git a/Cargo.toml b/Cargo.toml index 4e562f6179..38bce5a808 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,7 +27,6 @@ members = [ "common/client-libs/gateway-client", "common/client-libs/mixnet-client", "common/client-libs/validator-client", - "common/client-connections", "common/coconut-interface", "common/commands", "common/config", diff --git a/clients/client-core/Cargo.toml b/clients/client-core/Cargo.toml index b1cbb77c2a..e5e5ceeefc 100644 --- a/clients/client-core/Cargo.toml +++ b/clients/client-core/Cargo.toml @@ -25,7 +25,6 @@ time = "0.3.17" # internal config = { path = "../../common/config" } -client-connections = { path = "../../common/client-connections" } nym-crypto = { path = "../../common/crypto" } gateway-client = { path = "../../common/client-libs/gateway-client" } #gateway-client = { path = "../../common/client-libs/gateway-client", default-features = false, features = ["wasm", "coconut"] } diff --git a/clients/client-core/src/client/base_client/mod.rs b/clients/client-core/src/client/base_client/mod.rs index 52b45a4e17..f517698bf2 100644 --- a/clients/client-core/src/client/base_client/mod.rs +++ b/clients/client-core/src/client/base_client/mod.rs @@ -21,7 +21,6 @@ use crate::client::topology_control::{ use crate::config::{Config, DebugConfig, GatewayEndpointConfig}; use crate::error::ClientCoreError; use crate::spawn_future; -use client_connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths}; use futures::channel::mpsc; use gateway_client::bandwidth::BandwidthController; #[cfg(target_arch = "wasm32")] @@ -36,6 +35,7 @@ use nym_sphinx::acknowledgements::AckKey; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::addressing::nodes::NodeIdentity; use nym_sphinx::receiver::ReconstructedMessage; +use nym_task::connections::{ConnectionCommandReceiver, ConnectionCommandSender, LaneQueueLengths}; use nym_task::{TaskClient, TaskManager}; use std::sync::Arc; use std::time::Duration; diff --git a/clients/client-core/src/client/inbound_messages.rs b/clients/client-core/src/client/inbound_messages.rs index ff2293936e..69f8af0d45 100644 --- a/clients/client-core/src/client/inbound_messages.rs +++ b/clients/client-core/src/client/inbound_messages.rs @@ -1,6 +1,6 @@ -use client_connections::TransmissionLane; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::TransmissionLane; pub type InputMessageSender = tokio::sync::mpsc::Sender; pub type InputMessageReceiver = tokio::sync::mpsc::Receiver; diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs index 85d73fa304..ae10c88015 100644 --- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs +++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs @@ -4,10 +4,10 @@ use crate::client::inbound_messages::{InputMessage, InputMessageReceiver}; use crate::client::real_messages_control::message_handler::MessageHandler; use crate::client::replies::reply_controller::ReplyControllerSender; -use client_connections::TransmissionLane; use log::*; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::TransmissionLane; use rand::{CryptoRng, Rng}; /// Module responsible for dealing with the received messages: splitting them, creating acknowledgements, diff --git a/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs b/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs index 45072dc2f3..194c440720 100644 --- a/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs +++ b/clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs @@ -9,12 +9,12 @@ use crate::client::real_messages_control::acknowledgement_control::PacketDestina use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError}; use crate::client::real_messages_control::real_traffic_stream::RealMessage; use crate::client::replies::reply_controller::ReplyControllerSender; -use client_connections::TransmissionLane; use futures::StreamExt; use log::*; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::chunking::fragment::Fragment; use nym_sphinx::preparer::PreparedFragment; +use nym_task::connections::TransmissionLane; use rand::{CryptoRng, Rng}; use std::sync::{Arc, Weak}; diff --git a/clients/client-core/src/client/real_messages_control/message_handler.rs b/clients/client-core/src/client/real_messages_control/message_handler.rs index 29f9a39fad..cad6974b25 100644 --- a/clients/client-core/src/client/real_messages_control/message_handler.rs +++ b/clients/client-core/src/client/real_messages_control/message_handler.rs @@ -8,7 +8,6 @@ use crate::client::real_messages_control::real_traffic_stream::{ use crate::client::real_messages_control::{AckActionSender, Action}; use crate::client::replies::reply_storage::{ReceivedReplySurbsMap, SentReplyKeys, UsedSenderTags}; use crate::client::topology_control::{TopologyAccessor, TopologyReadPermit}; -use client_connections::TransmissionLane; use log::{debug, error, info, trace, warn}; use nym_sphinx::acknowledgements::AckKey; use nym_sphinx::addressing::clients::Recipient; @@ -19,6 +18,7 @@ use nym_sphinx::message::NymMessage; use nym_sphinx::params::{PacketSize, DEFAULT_NUM_MIX_HOPS}; use nym_sphinx::preparer::{MessagePreparer, PreparedFragment}; use nym_sphinx::Delay; +use nym_task::connections::TransmissionLane; use nym_topology::{NymTopology, NymTopologyError}; use rand::{CryptoRng, Rng}; use std::collections::HashMap; diff --git a/clients/client-core/src/client/real_messages_control/mod.rs b/clients/client-core/src/client/real_messages_control/mod.rs index bb40312aa9..69ca797e67 100644 --- a/clients/client-core/src/client/real_messages_control/mod.rs +++ b/clients/client-core/src/client/real_messages_control/mod.rs @@ -21,13 +21,13 @@ use crate::{ }, spawn_future, }; -use client_connections::{ConnectionCommandReceiver, LaneQueueLengths}; use futures::channel::mpsc; use gateway_client::AcknowledgementReceiver; use log::*; use nym_sphinx::acknowledgements::AckKey; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::params::PacketSize; +use nym_task::connections::{ConnectionCommandReceiver, LaneQueueLengths}; use rand::{rngs::OsRng, CryptoRng, Rng}; use std::sync::Arc; use std::time::Duration; diff --git a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs index 650a77870a..4bcebe75d0 100644 --- a/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs +++ b/clients/client-core/src/client/real_messages_control/real_traffic_stream.rs @@ -6,9 +6,6 @@ use crate::client::mix_traffic::BatchMixMessageSender; use crate::client::real_messages_control::acknowledgement_control::SentPacketNotificationSender; use crate::client::topology_control::TopologyAccessor; use crate::client::transmission_buffer::TransmissionBuffer; -use client_connections::{ - ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane, -}; use futures::task::{Context, Poll}; use futures::{Future, Stream, StreamExt}; use log::*; @@ -20,6 +17,9 @@ use nym_sphinx::forwarding::packet::MixPacket; use nym_sphinx::params::PacketSize; use nym_sphinx::preparer::PreparedFragment; use nym_sphinx::utils::sample_poisson_duration; +use nym_task::connections::{ + ConnectionCommand, ConnectionCommandReceiver, ConnectionId, LaneQueueLengths, TransmissionLane, +}; use rand::{CryptoRng, Rng}; use std::pin::Pin; use std::sync::Arc; diff --git a/clients/client-core/src/client/replies/reply_controller/mod.rs b/clients/client-core/src/client/replies/reply_controller/mod.rs index 7df94c08c7..267e2ada1f 100644 --- a/clients/client-core/src/client/replies/reply_controller/mod.rs +++ b/clients/client-core/src/client/replies/reply_controller/mod.rs @@ -4,7 +4,6 @@ use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement; use crate::client::real_messages_control::message_handler::{MessageHandler, PreparationError}; use crate::client::replies::reply_storage::CombinedReplyStorage; -use client_connections::{ConnectionId, TransmissionLane}; use futures::channel::oneshot; use futures::StreamExt; use log::{debug, error, info, trace, warn}; @@ -12,6 +11,7 @@ use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; use nym_sphinx::anonymous_replies::ReplySurb; use nym_sphinx::chunking::fragment::{Fragment, FragmentIdentifier}; +use nym_task::connections::{ConnectionId, TransmissionLane}; use rand::{CryptoRng, Rng}; use std::cmp::{max, min}; use std::collections::btree_map::Entry; diff --git a/clients/client-core/src/client/replies/reply_controller/requests.rs b/clients/client-core/src/client/replies/reply_controller/requests.rs index b4322c1e54..a215805088 100644 --- a/clients/client-core/src/client/replies/reply_controller/requests.rs +++ b/clients/client-core/src/client/replies/reply_controller/requests.rs @@ -2,12 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 use crate::client::real_messages_control::acknowledgement_control::PendingAcknowledgement; -use client_connections::{ConnectionId, TransmissionLane}; use futures::channel::{mpsc, oneshot}; use log::error; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; use nym_sphinx::anonymous_replies::ReplySurb; +use nym_task::connections::{ConnectionId, TransmissionLane}; use std::sync::Weak; pub(crate) fn new_control_channels() -> (ReplyControllerSender, ReplyControllerReceiver) { diff --git a/clients/client-core/src/client/transmission_buffer.rs b/clients/client-core/src/client/transmission_buffer.rs index a8a26d1dd9..7686957fee 100644 --- a/clients/client-core/src/client/transmission_buffer.rs +++ b/clients/client-core/src/client/transmission_buffer.rs @@ -3,8 +3,8 @@ use crate::client::helpers::{get_time_now, Instant}; use crate::client::real_messages_control::real_traffic_stream::RealMessage; -use client_connections::TransmissionLane; use nym_sphinx::chunking::fragment::Fragment; +use nym_task::connections::TransmissionLane; use rand::{seq::SliceRandom, Rng}; use std::{ collections::{HashMap, HashSet, VecDeque}, diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 104da1e222..7de33b78b2 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -36,7 +36,6 @@ tokio-tungstenite = "0.14" # websocket ## internal nym-bin-common = { path = "../../common/bin-common" } client-core = { path = "../client-core", features = ["fs-surb-storage"] } -client-connections = { path = "../../common/client-connections" } coconut-interface = { path = "../../common/coconut-interface" } config = { path = "../../common/config" } credential-storage = { path = "../../common/credential-storage" } diff --git a/clients/native/src/client/mod.rs b/clients/native/src/client/mod.rs index ddd6ea0ce2..2d3d33f458 100644 --- a/clients/native/src/client/mod.rs +++ b/clients/native/src/client/mod.rs @@ -6,7 +6,6 @@ use std::error::Error; use crate::client::config::Config; use crate::error::ClientError; use crate::websocket; -use client_connections::TransmissionLane; use client_core::client::base_client::{ non_wasm_helpers, BaseClientBuilder, ClientInput, ClientOutput, ClientState, }; @@ -19,6 +18,7 @@ use futures::channel::mpsc; use gateway_client::bandwidth::BandwidthController; use log::*; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::TransmissionLane; use nym_task::TaskManager; use tokio::sync::watch::error::SendError; use validator_client::nyxd::QueryNyxdClient; diff --git a/clients/native/src/websocket/handler.rs b/clients/native/src/websocket/handler.rs index 753d2c4386..e0d3501927 100644 --- a/clients/native/src/websocket/handler.rs +++ b/clients/native/src/websocket/handler.rs @@ -1,9 +1,6 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use client_connections::{ - ConnectionCommand, ConnectionCommandSender, ConnectionId, LaneQueueLengths, TransmissionLane, -}; use client_core::client::replies::reply_controller::requests::ReplyControllerSender; use client_core::client::{ inbound_messages::{InputMessage, InputMessageSender}, @@ -17,6 +14,9 @@ use log::*; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; use nym_sphinx::receiver::ReconstructedMessage; +use nym_task::connections::{ + ConnectionCommand, ConnectionCommandSender, ConnectionId, LaneQueueLengths, TransmissionLane, +}; use std::time::Duration; use tokio::net::TcpStream; use tokio::time::Instant; diff --git a/clients/socks5/Cargo.toml b/clients/socks5/Cargo.toml index ab59a1dc76..cbd03069ee 100644 --- a/clients/socks5/Cargo.toml +++ b/clients/socks5/Cargo.toml @@ -29,7 +29,6 @@ url = "2.2" # internal nym-bin-common = { path = "../../common/bin-common" } client-core = { path = "../client-core", features = ["fs-surb-storage"] } -client-connections = { path = "../../common/client-connections" } coconut-interface = { path = "../../common/coconut-interface" } config = { path = "../../common/config" } credential-storage = { path = "../../common/credential-storage", optional = true } diff --git a/clients/socks5/src/socks/client.rs b/clients/socks5/src/socks/client.rs index 15dc64a513..83e5c68530 100644 --- a/clients/socks5/src/socks/client.rs +++ b/clients/socks5/src/socks/client.rs @@ -4,12 +4,12 @@ use super::authentication::{AuthenticationMethods, Authenticator, User}; use super::request::{SocksCommand, SocksRequest}; use super::types::{ResponseCodeV4, ResponseCodeV5, SocksProxyError}; use super::{SocksVersion, RESERVED, SOCKS4_VERSION, SOCKS5_VERSION}; -use client_connections::{LaneQueueLengths, TransmissionLane}; use client_core::client::inbound_messages::{InputMessage, InputMessageSender}; use futures::channel::mpsc; use futures::task::{Context, Poll}; use log::*; use nym_sphinx::addressing::clients::Recipient; +use nym_task::connections::{LaneQueueLengths, TransmissionLane}; use nym_task::TaskClient; use pin_project::pin_project; use proxy_helpers::connection_controller::{ diff --git a/clients/socks5/src/socks/server.rs b/clients/socks5/src/socks/server.rs index 23ace2e198..f986f90777 100644 --- a/clients/socks5/src/socks/server.rs +++ b/clients/socks5/src/socks/server.rs @@ -4,12 +4,12 @@ use super::{ authentication::Authenticator, client::SocksClient, mixnet_responses::MixnetResponseListener, }; use crate::socks::client; -use client_connections::{ConnectionCommandSender, LaneQueueLengths}; use client_core::client::{ inbound_messages::InputMessageSender, received_buffer::ReceivedBufferRequestSender, }; use log::*; use nym_sphinx::addressing::clients::Recipient; +use nym_task::connections::{ConnectionCommandSender, LaneQueueLengths}; use nym_task::TaskClient; use proxy_helpers::connection_controller::Controller; use std::net::SocketAddr; diff --git a/clients/webassembly/Cargo.toml b/clients/webassembly/Cargo.toml index 430dc7a7d3..87bcd3ce91 100644 --- a/clients/webassembly/Cargo.toml +++ b/clients/webassembly/Cargo.toml @@ -31,7 +31,6 @@ wasm-bindgen-futures = "0.4" # internal client-core = { path = "../client-core", default-features = false, features = ["wasm"] } -client-connections = { path = "../../common/client-connections" } coconut-interface = { path = "../../common/coconut-interface" } credentials = { path = "../../common/credentials" } nym-crypto = { path = "../../common/crypto" } diff --git a/clients/webassembly/src/client/mod.rs b/clients/webassembly/src/client/mod.rs index 34ec4a9396..dd45c28bb8 100644 --- a/clients/webassembly/src/client/mod.rs +++ b/clients/webassembly/src/client/mod.rs @@ -4,7 +4,6 @@ use self::config::Config; use crate::client::helpers::InputSender; use crate::client::response_pusher::ResponsePusher; -use client_connections::TransmissionLane; use client_core::client::base_client::{ BaseClientBuilder, ClientInput, ClientOutput, CredentialsToggle, }; @@ -15,6 +14,7 @@ use gateway_client::wasm_mockups::SigningNyxdClient; use js_sys::Promise; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::TransmissionLane; use nym_task::TaskManager; use rand::rngs::OsRng; use std::sync::Arc; diff --git a/common/client-connections/Cargo.toml b/common/client-connections/Cargo.toml deleted file mode 100644 index a3d51b3b54..0000000000 --- a/common/client-connections/Cargo.toml +++ /dev/null @@ -1,10 +0,0 @@ -[package] -name = "client-connections" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -futures = "0.3" -log = { workspace = true } diff --git a/common/socks5/proxy-helpers/Cargo.toml b/common/socks5/proxy-helpers/Cargo.toml index 8e7c44d1a6..3f1403fd9b 100644 --- a/common/socks5/proxy-helpers/Cargo.toml +++ b/common/socks5/proxy-helpers/Cargo.toml @@ -16,7 +16,6 @@ futures = "0.3" log = { workspace = true } # internal -client-connections = { path = "../../client-connections" } ordered-buffer = { path = "../ordered-buffer" } socks5-requests = { path = "../requests" } nym-task = { path = "../../task" } diff --git a/common/socks5/proxy-helpers/src/connection_controller.rs b/common/socks5/proxy-helpers/src/connection_controller.rs index 79e06025c5..b50e0fb7a3 100644 --- a/common/socks5/proxy-helpers/src/connection_controller.rs +++ b/common/socks5/proxy-helpers/src/connection_controller.rs @@ -1,10 +1,10 @@ // Copyright 2021 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use client_connections::{ConnectionCommand, ConnectionCommandSender}; use futures::channel::mpsc; use futures::StreamExt; use log::*; +use nym_task::connections::{ConnectionCommand, ConnectionCommandSender}; use nym_task::TaskClient; use ordered_buffer::{OrderedMessage, OrderedMessageBuffer, ReadContiguousData}; use socks5_requests::{ConnectionId, NetworkData, SendRequest}; diff --git a/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs b/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs index 520843167c..959de166de 100644 --- a/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs +++ b/common/socks5/proxy-helpers/src/proxy_runner/inbound.rs @@ -5,11 +5,11 @@ use super::MixProxySender; use super::SHUTDOWN_TIMEOUT; use crate::available_reader::AvailableReader; use bytes::Bytes; -use client_connections::LaneQueueLengths; -use client_connections::TransmissionLane; use futures::FutureExt; use futures::StreamExt; use log::*; +use nym_task::connections::LaneQueueLengths; +use nym_task::connections::TransmissionLane; use nym_task::TaskClient; use ordered_buffer::OrderedMessageSender; use socks5_requests::ConnectionId; diff --git a/common/socks5/proxy-helpers/src/proxy_runner/mod.rs b/common/socks5/proxy-helpers/src/proxy_runner/mod.rs index 3304cba8d2..d0e427c2da 100644 --- a/common/socks5/proxy-helpers/src/proxy_runner/mod.rs +++ b/common/socks5/proxy-helpers/src/proxy_runner/mod.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use crate::connection_controller::ConnectionReceiver; -use client_connections::LaneQueueLengths; +use nym_task::connections::LaneQueueLengths; use nym_task::TaskClient; use socks5_requests::ConnectionId; use std::fmt::Debug; diff --git a/common/client-connections/src/lib.rs b/common/task/src/connections.rs similarity index 100% rename from common/client-connections/src/lib.rs rename to common/task/src/connections.rs diff --git a/common/task/src/lib.rs b/common/task/src/lib.rs index eab1fc2177..b719da3a6f 100644 --- a/common/task/src/lib.rs +++ b/common/task/src/lib.rs @@ -1,6 +1,7 @@ // Copyright 2022 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 +pub mod connections; pub mod manager; #[cfg(not(target_arch = "wasm32"))] pub mod signal; diff --git a/nym-connect-android/src-tauri/Cargo.lock b/nym-connect-android/src-tauri/Cargo.lock index 02aa333473..cb0e68c00b 100644 --- a/nym-connect-android/src-tauri/Cargo.lock +++ b/nym-connect-android/src-tauri/Cargo.lock @@ -610,20 +610,11 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "client-connections" -version = "0.1.0" -dependencies = [ - "futures", - "log", -] - [[package]] name = "client-core" version = "1.1.9" dependencies = [ "async-trait", - "client-connections", "config", "dashmap", "dirs", @@ -3633,7 +3624,6 @@ name = "nym-socks5-client" version = "1.1.9" dependencies = [ "clap", - "client-connections", "client-core", "coconut-interface", "config", @@ -4491,7 +4481,6 @@ name = "proxy-helpers" version = "0.1.0" dependencies = [ "bytes", - "client-connections", "futures", "log", "nym-task", diff --git a/sdk/rust/nym-sdk/Cargo.toml b/sdk/rust/nym-sdk/Cargo.toml index 253cb76716..362af20483 100644 --- a/sdk/rust/nym-sdk/Cargo.toml +++ b/sdk/rust/nym-sdk/Cargo.toml @@ -6,7 +6,6 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -client-connections = { path = "../../../common/client-connections" } client-core = { path = "../../../clients/client-core", features = ["fs-surb-storage"]} nym-crypto = { path = "../../../common/crypto" } gateway-client = { path = "../../../common/client-libs/gateway-client" } diff --git a/sdk/rust/nym-sdk/src/mixnet/client.rs b/sdk/rust/nym-sdk/src/mixnet/client.rs index 11b5113d43..d8b1e06b65 100644 --- a/sdk/rust/nym-sdk/src/mixnet/client.rs +++ b/sdk/rust/nym-sdk/src/mixnet/client.rs @@ -1,6 +1,5 @@ use std::{path::Path, sync::Arc}; -use client_connections::TransmissionLane; use client_core::{ client::{ base_client::{ @@ -18,7 +17,10 @@ use nym_sphinx::{ addressing::clients::{ClientIdentity, Recipient}, receiver::ReconstructedMessage, }; -use nym_task::TaskManager; +use nym_task::{ + connections::{ConnectionCommandSender, LaneQueueLengths, TransmissionLane}, + TaskManager, +}; use futures::StreamExt; use validator_client::nyxd::SigningNyxdClient; @@ -500,13 +502,13 @@ impl MixnetClient { /// Get a shallow clone of [`ConnectionCommandSender`]. This is useful if you want to e.g /// explictly close a transmission lane that is still sending data even though it should /// cancel. - pub fn connection_command_sender(&self) -> client_connections::ConnectionCommandSender { + pub fn connection_command_sender(&self) -> ConnectionCommandSender { self.client_input.connection_command_sender.clone() } /// Get a shallow clone of [`LaneQueueLengths`]. This is useful to manually implement some form /// of backpressure logic. - pub fn shared_lane_queue_lengths(&self) -> client_connections::LaneQueueLengths { + pub fn shared_lane_queue_lengths(&self) -> LaneQueueLengths { self.client_state.shared_lane_queue_lengths.clone() } diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 0bb058fe6e..483c5f99ab 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -31,7 +31,6 @@ tokio-tungstenite = "0.17.2" url = { workspace = true } # internal -client-connections = { path = "../../common/client-connections" } client-core = { path = "../../clients/client-core" } config = { path = "../../common/config" } nym-crypto = { path = "../../common/crypto" } diff --git a/service-providers/network-requester/src/core.rs b/service-providers/network-requester/src/core.rs index e05f8bbeb0..a0f4ae5878 100644 --- a/service-providers/network-requester/src/core.rs +++ b/service-providers/network-requester/src/core.rs @@ -9,12 +9,12 @@ use crate::reply::MixnetMessage; use crate::statistics::ServiceStatisticsCollector; use crate::{reply, socks5}; use async_trait::async_trait; -use client_connections::LaneQueueLengths; use futures::channel::mpsc; use log::warn; use nym_bin_common::build_information::BinaryBuildInformation; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::LaneQueueLengths; use nym_task::{TaskClient, TaskManager}; use proxy_helpers::connection_controller::{Controller, ControllerCommand, ControllerSender}; use proxy_helpers::proxy_runner::{MixProxyReader, MixProxySender}; diff --git a/service-providers/network-requester/src/reply.rs b/service-providers/network-requester/src/reply.rs index 947951f06b..6f49263694 100644 --- a/service-providers/network-requester/src/reply.rs +++ b/service-providers/network-requester/src/reply.rs @@ -1,10 +1,10 @@ // Copyright 2022-2023 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use client_connections::TransmissionLane; use nym_sdk::mixnet::InputMessage; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; +use nym_task::connections::TransmissionLane; use service_providers_common::interface::{ ControlRequest, ControlResponse, ProviderInterfaceVersion, RequestVersion, }; diff --git a/service-providers/network-requester/src/socks5/tcp.rs b/service-providers/network-requester/src/socks5/tcp.rs index 45f173c1c7..32c6a8c241 100644 --- a/service-providers/network-requester/src/socks5/tcp.rs +++ b/service-providers/network-requester/src/socks5/tcp.rs @@ -3,7 +3,7 @@ use crate::reply; use crate::reply::MixnetMessage; -use client_connections::LaneQueueLengths; +use nym_task::connections::LaneQueueLengths; use nym_task::TaskClient; use proxy_helpers::connection_controller::ConnectionReceiver; use proxy_helpers::proxy_runner::{MixProxySender, ProxyRunner};