GRIN/nym
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move client-connections crate to nym-task (#3068)

Browse Source 
* Move client-connections to nym-task

* rustfmt
This commit is contained in:
Jon Häggblad
2023-02-21 13:54:27 +01:00
committed by GitHub
parent b1121dabb9
commit 586d5f658b
35 changed files with 33 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
-14
View File
@@ -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",
Cargo.toml
-1
View File
@@ -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",
clients/client-core/Cargo.toml
-1
View File
@@ -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"] }
clients/client-core/src/client/base_client/mod.rs
+1 -1
View File
@@ -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;
clients/client-core/src/client/inbound_messages.rs
+1 -1
View File
@@ -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<InputMessage>;
pub type InputMessageReceiver = tokio::sync::mpsc::Receiver<InputMessage>;
clients/client-core/src/client/real_messages_control/acknowledgement_control/input_message_listener.rs
+1 -1
View File
@@ -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,
clients/client-core/src/client/real_messages_control/acknowledgement_control/retransmission_request_listener.rs
+1 -1
View File
@@ -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};
clients/client-core/src/client/real_messages_control/message_handler.rs
+1 -1
View File
@@ -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;
clients/client-core/src/client/real_messages_control/mod.rs
+1 -1
View File
@@ -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;
clients/client-core/src/client/real_messages_control/real_traffic_stream.rs
+3 -3
View File
@@ -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;
clients/client-core/src/client/replies/reply_controller/mod.rs
+1 -1
View File
@@ -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;
clients/client-core/src/client/replies/reply_controller/requests.rs
+1 -1
View File
@@ -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) {
clients/client-core/src/client/transmission_buffer.rs
+1 -1
View File
@@ -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},
clients/native/Cargo.toml
-1
View File
@@ -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" }
clients/native/src/client/mod.rs
+1 -1
View File
@@ -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;
clients/native/src/websocket/handler.rs
+3 -3
View File
@@ -1,9 +1,6 @@
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
// 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;
clients/socks5/Cargo.toml
-1
View File
@@ -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 }
clients/socks5/src/socks/client.rs
+1 -1
View File
@@ -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::{
clients/socks5/src/socks/server.rs
+1 -1
View File
@@ -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;
clients/webassembly/Cargo.toml
-1
View File
@@ -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" }
clients/webassembly/src/client/mod.rs
+1 -1
View File
@@ -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;
common/client-connections/Cargo.toml
-10
View File
@@ -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 }
common/socks5/proxy-helpers/Cargo.toml
-1
View File
@@ -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" }
common/socks5/proxy-helpers/src/connection_controller.rs
+1 -1
View File
@@ -1,10 +1,10 @@
// Copyright 2021 - Nym Technologies SA <contact@nymtech.net>
// 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};
common/socks5/proxy-helpers/src/proxy_runner/inbound.rs
+2 -2
View File
@@ -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;
common/socks5/proxy-helpers/src/proxy_runner/mod.rs
+1 -1
View File
@@ -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;
common/client-connections/src/lib.rs → common/task/src/connections.rs
View File
common/task/src/lib.rs
+1
View File
@@ -1,6 +1,7 @@
// Copyright 2022 - Nym Technologies SA <contact@nymtech.net>
// SPDX-License-Identifier: Apache-2.0
pub mod connections;
pub mod manager;
#[cfg(not(target_arch = "wasm32"))]
pub mod signal;
nym-connect-android/src-tauri/Cargo.lock
Generated
-11
View File
@@ -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",
sdk/rust/nym-sdk/Cargo.toml
-1
View File
@@ -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" }
sdk/rust/nym-sdk/src/mixnet/client.rs
+6 -4
View File
@@ -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()
}
service-providers/network-requester/Cargo.toml
-1
View File
@@ -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" }
service-providers/network-requester/src/core.rs
+1 -1
View File
@@ -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};
service-providers/network-requester/src/reply.rs
+1 -1
View File
@@ -1,10 +1,10 @@
// Copyright 2022-2023 - Nym Technologies SA <contact@nymtech.net>
// 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,
};
service-providers/network-requester/src/socks5/tcp.rs
+1 -1
View File
@@ -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};