From dc5c765ecb35e69595f40e41e9bf60484605b6f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= Date: Fri, 7 Apr 2023 21:25:28 +0200 Subject: [PATCH] Last set of crates to add the nym- prefix to (#3286) * Add nym- prefix to mixnode-common * Add nym- prefix to mixnet-client * Add nym-client- prefix to websocket-requests * Makefile: add check target * Rename to nym-credential-client * rustfmt * update to nym-credential-client in github workflow --- .../build-and-upload-binaries-ci.yml | 2 +- Cargo.lock | 160 +++++++++--------- Makefile | 4 + clients/credential/Cargo.toml | 2 +- clients/native/Cargo.toml | 2 +- .../native/examples/websocket_binarysend.rs | 2 +- clients/native/src/websocket/handler.rs | 2 +- clients/native/websocket-requests/Cargo.toml | 2 +- common/client-libs/mixnet-client/Cargo.toml | 2 +- common/mixnode-common/Cargo.toml | 2 +- gateway/Cargo.toml | 4 +- .../websocket/connection_handler/fresh.rs | 2 +- .../client_handling/websocket/listener.rs | 2 +- .../receiver/connection_handler.rs | 4 +- .../receiver/packet_processing.rs | 6 +- gateway/src/node/mod.rs | 2 +- mixnode/Cargo.toml | 6 +- mixnode/src/main.rs | 4 +- mixnode/src/node/http/verloc.rs | 2 +- .../node/listener/connection_handler/mod.rs | 2 +- .../connection_handler/packet_processing.rs | 6 +- mixnode/src/node/mod.rs | 6 +- mixnode/src/node/packet_delayforwarder.rs | 6 +- .../network-requester/Cargo.toml | 2 +- 24 files changed, 119 insertions(+), 115 deletions(-) diff --git a/.github/workflows/build-and-upload-binaries-ci.yml b/.github/workflows/build-and-upload-binaries-ci.yml index 64b016438c..537e239753 100644 --- a/.github/workflows/build-and-upload-binaries-ci.yml +++ b/.github/workflows/build-and-upload-binaries-ci.yml @@ -98,7 +98,7 @@ jobs: cp target/release/nym-network-requester $OUTPUT_DIR cp target/release/nym-network-statistics $OUTPUT_DIR cp target/release/nym-cli $OUTPUT_DIR - cp target/release/credential $OUTPUT_DIR + cp target/release/nym-credential-client $OUTPUT_DIR cp target/release/explorer-api $OUTPUT_DIR cp contracts/target/wasm32-unknown-unknown/release/mixnet_contract.wasm $OUTPUT_DIR diff --git a/Cargo.lock b/Cargo.lock index 8e56f932f4..872506e068 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -912,29 +912,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "credential" -version = "0.1.0" -dependencies = [ - "bip39", - "clap 4.1.11", - "log", - "nym-bin-common", - "nym-coconut-interface", - "nym-config", - "nym-credential-storage", - "nym-credentials", - "nym-crypto", - "nym-network-defaults", - "nym-pemstore", - "nym-validator-client", - "rand 0.7.3", - "serde", - "thiserror", - "tokio", - "url", -] - [[package]] name = "criterion" version = "0.4.0" @@ -2900,48 +2877,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "mixnet-client" -version = "0.1.0" -dependencies = [ - "futures", - "log", - "nym-sphinx", - "nym-task", - "tokio", - "tokio-util", -] - -[[package]] -name = "mixnode-common" -version = "0.1.0" -dependencies = [ - "bytes", - "cfg-if", - "cpu-cycles", - "futures", - "humantime-serde", - "log", - "nym-bin-common", - "nym-crypto", - "nym-network-defaults", - "nym-sphinx-acknowledgements", - "nym-sphinx-addressing", - "nym-sphinx-forwarding", - "nym-sphinx-framing", - "nym-sphinx-params", - "nym-sphinx-types", - "nym-task", - "nym-validator-client", - "rand 0.8.5", - "serde", - "thiserror", - "tokio", - "tokio-util", - "tracing", - "url", -] - [[package]] name = "multer" version = "2.0.4" @@ -3260,6 +3195,7 @@ dependencies = [ "log", "nym-bin-common", "nym-client-core", + "nym-client-websocket-requests", "nym-coconut-interface", "nym-config", "nym-credential-storage", @@ -3282,7 +3218,6 @@ dependencies = [ "tokio", "tokio-tungstenite 0.14.0", "url", - "websocket-requests", ] [[package]] @@ -3325,6 +3260,15 @@ dependencies = [ "wasm-utils", ] +[[package]] +name = "nym-client-websocket-requests" +version = "0.1.0" +dependencies = [ + "nym-sphinx", + "serde", + "serde_json", +] + [[package]] name = "nym-coconut" version = "0.5.0" @@ -3406,6 +3350,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nym-credential-client" +version = "0.1.0" +dependencies = [ + "bip39", + "clap 4.1.11", + "log", + "nym-bin-common", + "nym-coconut-interface", + "nym-config", + "nym-credential-storage", + "nym-credentials", + "nym-crypto", + "nym-network-defaults", + "nym-pemstore", + "nym-validator-client", + "rand 0.7.3", + "serde", + "thiserror", + "tokio", + "url", +] + [[package]] name = "nym-credential-storage" version = "0.1.0" @@ -3505,8 +3472,6 @@ dependencies = [ "humantime-serde", "lazy_static", "log", - "mixnet-client", - "mixnode-common", "nym-api-requests", "nym-bin-common", "nym-coconut-interface", @@ -3514,6 +3479,8 @@ dependencies = [ "nym-credentials", "nym-crypto", "nym-gateway-requests", + "nym-mixnet-client", + "nym-mixnode-common", "nym-network-defaults", "nym-pemstore", "nym-sphinx", @@ -3606,6 +3573,18 @@ dependencies = [ "thiserror", ] +[[package]] +name = "nym-mixnet-client" +version = "0.1.0" +dependencies = [ + "futures", + "log", + "nym-sphinx", + "nym-task", + "tokio", + "tokio-util", +] + [[package]] name = "nym-mixnet-contract-common" version = "0.3.0" @@ -3641,12 +3620,12 @@ dependencies = [ "humantime-serde", "lazy_static", "log", - "mixnet-client", - "mixnode-common", "nym-bin-common", "nym-config", "nym-contracts-common", "nym-crypto", + "nym-mixnet-client", + "nym-mixnode-common", "nym-nonexhaustive-delayqueue", "nym-pemstore", "nym-sphinx", @@ -3670,6 +3649,36 @@ dependencies = [ "url", ] +[[package]] +name = "nym-mixnode-common" +version = "0.1.0" +dependencies = [ + "bytes", + "cfg-if", + "cpu-cycles", + "futures", + "humantime-serde", + "log", + "nym-bin-common", + "nym-crypto", + "nym-network-defaults", + "nym-sphinx-acknowledgements", + "nym-sphinx-addressing", + "nym-sphinx-forwarding", + "nym-sphinx-framing", + "nym-sphinx-params", + "nym-sphinx-types", + "nym-task", + "nym-validator-client", + "rand 0.8.5", + "serde", + "thiserror", + "tokio", + "tokio-util", + "tracing", + "url", +] + [[package]] name = "nym-mobile-storage" version = "0.1.0" @@ -3720,6 +3729,7 @@ dependencies = [ "log", "nym-bin-common", "nym-client-core", + "nym-client-websocket-requests", "nym-config", "nym-crypto", "nym-network-defaults", @@ -3743,7 +3753,6 @@ dependencies = [ "tokio", "tokio-tungstenite 0.17.2", "url", - "websocket-requests", ] [[package]] @@ -7238,15 +7247,6 @@ dependencies = [ "webpki 0.22.0", ] -[[package]] -name = "websocket-requests" -version = "0.1.0" -dependencies = [ - "nym-sphinx", - "serde", - "serde_json", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Makefile b/Makefile index 14a70c5d43..e59bf7cdb5 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,9 @@ clippy-$(1): clippy-$(1)-examples: cargo clippy --manifest-path $(2)/Cargo.toml --workspace --examples -- -D warnings +check-$(1): + cargo check --manifest-path $(2)/Cargo.toml --workspace $(3) + test-$(1): cargo test --manifest-path $(2)/Cargo.toml --workspace @@ -43,6 +46,7 @@ fmt-$(1): clippy-happy: clippy-happy-$(1) clippy-all: clippy-$(1) clippy-$(1)-examples +check: check-$(1) cargo-test: test-$(1) cargo-test-expensive: test-$(1)-expensive build: build-$(1) build-$(1)-examples diff --git a/clients/credential/Cargo.toml b/clients/credential/Cargo.toml index 1e54c349af..1ac02361af 100644 --- a/clients/credential/Cargo.toml +++ b/clients/credential/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "credential" +name = "nym-credential-client" version = "0.1.0" edition = "2021" diff --git a/clients/native/Cargo.toml b/clients/native/Cargo.toml index 4eefecccbc..05e3fecefd 100644 --- a/clients/native/Cargo.toml +++ b/clients/native/Cargo.toml @@ -49,6 +49,6 @@ nym-pemstore = { path = "../../common/pemstore" } nym-task = { path = "../../common/task" } nym-topology = { path = "../../common/topology" } nym-validator-client = { path = "../../common/client-libs/validator-client", features = ["nyxd-client"] } -websocket-requests = { path = "websocket-requests" } +nym-client-websocket-requests = { path = "websocket-requests" } [dev-dependencies] diff --git a/clients/native/examples/websocket_binarysend.rs b/clients/native/examples/websocket_binarysend.rs index 2b7fec32d0..778aae73c4 100644 --- a/clients/native/examples/websocket_binarysend.rs +++ b/clients/native/examples/websocket_binarysend.rs @@ -1,10 +1,10 @@ use futures::{SinkExt, StreamExt}; +use nym_client_websocket_requests::{requests::ClientRequest, responses::ServerResponse}; use nym_sphinx::addressing::clients::Recipient; use tokio::net::TcpStream; use tokio_tungstenite::{ connect_async, tungstenite::protocol::Message, MaybeTlsStream, WebSocketStream, }; -use websocket_requests::{requests::ClientRequest, responses::ServerResponse}; // just helpers functions that work in this very particular context because we are sending to ourselves // and hence will always get a response back (i.e. the message we sent) diff --git a/clients/native/src/websocket/handler.rs b/clients/native/src/websocket/handler.rs index abaafb5076..a0eebbf9be 100644 --- a/clients/native/src/websocket/handler.rs +++ b/clients/native/src/websocket/handler.rs @@ -11,6 +11,7 @@ use nym_client_core::client::{ ReceivedBufferMessage, ReceivedBufferRequestSender, ReconstructedMessagesReceiver, }, }; +use nym_client_websocket_requests::{requests::ClientRequest, responses::ServerResponse}; use nym_sphinx::addressing::clients::Recipient; use nym_sphinx::anonymous_replies::requests::AnonymousSenderTag; use nym_sphinx::receiver::ReconstructedMessage; @@ -25,7 +26,6 @@ use tokio_tungstenite::{ tungstenite::{protocol::Message as WsMessage, Error as WsError}, WebSocketStream, }; -use websocket_requests::{requests::ClientRequest, responses::ServerResponse}; #[derive(Default)] enum ReceivedResponseType { diff --git a/clients/native/websocket-requests/Cargo.toml b/clients/native/websocket-requests/Cargo.toml index cd1f5b589f..99ec632fef 100644 --- a/clients/native/websocket-requests/Cargo.toml +++ b/clients/native/websocket-requests/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "websocket-requests" +name = "nym-client-websocket-requests" version = "0.1.0" authors = ["Jędrzej Stuczyński "] edition = "2021" diff --git a/common/client-libs/mixnet-client/Cargo.toml b/common/client-libs/mixnet-client/Cargo.toml index f9763d626a..fabcca892d 100644 --- a/common/client-libs/mixnet-client/Cargo.toml +++ b/common/client-libs/mixnet-client/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mixnet-client" +name = "nym-mixnet-client" version = "0.1.0" authors = ["Jedrzej Stuczynski "] edition = "2021" diff --git a/common/mixnode-common/Cargo.toml b/common/mixnode-common/Cargo.toml index 7b88cb0673..9a3f0ce851 100644 --- a/common/mixnode-common/Cargo.toml +++ b/common/mixnode-common/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "mixnode-common" +name = "nym-mixnode-common" version = "0.1.0" authors = ["Jędrzej Stuczyński "] edition = "2021" diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml index 3c8273a49d..1e11bf6961 100644 --- a/gateway/Cargo.toml +++ b/gateway/Cargo.toml @@ -58,8 +58,8 @@ nym-config = { path = "../common/config" } nym-crypto = { path = "../common/crypto" } nym-bin-common = { path = "../common/bin-common", features = ["output_format"] } nym-gateway-requests = { path = "gateway-requests" } -mixnet-client = { path = "../common/client-libs/mixnet-client" } -mixnode-common = { path = "../common/mixnode-common" } +nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } +nym-mixnode-common = { path = "../common/mixnode-common" } nym-network-defaults = { path = "../common/network-defaults" } nym-sphinx = { path = "../common/nymsphinx" } nym-pemstore = { path = "../common/pemstore" } diff --git a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs index 25ec1b4569..42cb0e7aca 100644 --- a/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs +++ b/gateway/src/node/client_handling/websocket/connection_handler/fresh.rs @@ -10,7 +10,6 @@ use crate::node::storage::error::StorageError; use crate::node::storage::Storage; use futures::{channel::mpsc, SinkExt, StreamExt}; use log::*; -use mixnet_client::forwarder::MixForwardingSender; use nym_crypto::asymmetric::identity; use nym_gateway_requests::authentication::encrypted_address::{ EncryptedAddressBytes, EncryptedAddressConversionError, @@ -20,6 +19,7 @@ use nym_gateway_requests::registration::handshake::error::HandshakeError; use nym_gateway_requests::registration::handshake::{gateway_handshake, SharedKeys}; use nym_gateway_requests::types::{ClientControlRequest, ServerResponse}; use nym_gateway_requests::{BinaryResponse, PROTOCOL_VERSION}; +use nym_mixnet_client::forwarder::MixForwardingSender; use nym_sphinx::DestinationAddressBytes; use rand::{CryptoRng, Rng}; use std::convert::TryFrom; diff --git a/gateway/src/node/client_handling/websocket/listener.rs b/gateway/src/node/client_handling/websocket/listener.rs index 02882cebc0..8811105b2e 100644 --- a/gateway/src/node/client_handling/websocket/listener.rs +++ b/gateway/src/node/client_handling/websocket/listener.rs @@ -6,8 +6,8 @@ use crate::node::client_handling::websocket::connection_handler::coconut::Coconu use crate::node::client_handling::websocket::connection_handler::FreshHandler; use crate::node::storage::Storage; use log::*; -use mixnet_client::forwarder::MixForwardingSender; use nym_crypto::asymmetric::identity; +use nym_mixnet_client::forwarder::MixForwardingSender; use rand::rngs::OsRng; use std::net::SocketAddr; use std::process; diff --git a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs index 66a7ddfbab..148dbc2579 100644 --- a/gateway/src/node/mixnet_handling/receiver/connection_handler.rs +++ b/gateway/src/node/mixnet_handling/receiver/connection_handler.rs @@ -8,8 +8,8 @@ use crate::node::storage::error::StorageError; use crate::node::storage::Storage; use futures::StreamExt; use log::*; -use mixnet_client::forwarder::MixForwardingSender; -use mixnode_common::packet_processor::processor::ProcessedFinalHop; +use nym_mixnet_client::forwarder::MixForwardingSender; +use nym_mixnode_common::packet_processor::processor::ProcessedFinalHop; use nym_sphinx::forwarding::packet::MixPacket; use nym_sphinx::framing::codec::SphinxCodec; use nym_sphinx::framing::packet::FramedSphinxPacket; diff --git a/gateway/src/node/mixnet_handling/receiver/packet_processing.rs b/gateway/src/node/mixnet_handling/receiver/packet_processing.rs index e82014818f..cf5e5e8e18 100644 --- a/gateway/src/node/mixnet_handling/receiver/packet_processing.rs +++ b/gateway/src/node/mixnet_handling/receiver/packet_processing.rs @@ -1,10 +1,10 @@ // Copyright 2020 - Nym Technologies SA // SPDX-License-Identifier: Apache-2.0 -use mixnode_common::packet_processor::error::MixProcessingError; -pub use mixnode_common::packet_processor::processor::MixProcessingResult; -use mixnode_common::packet_processor::processor::{ProcessedFinalHop, SphinxPacketProcessor}; use nym_crypto::asymmetric::encryption; +use nym_mixnode_common::packet_processor::error::MixProcessingError; +pub use nym_mixnode_common::packet_processor::processor::MixProcessingResult; +use nym_mixnode_common::packet_processor::processor::{ProcessedFinalHop, SphinxPacketProcessor}; use nym_sphinx::framing::packet::FramedSphinxPacket; use thiserror::Error; diff --git a/gateway/src/node/mod.rs b/gateway/src/node/mod.rs index 0987465c1f..1802fa413b 100644 --- a/gateway/src/node/mod.rs +++ b/gateway/src/node/mod.rs @@ -12,9 +12,9 @@ use crate::node::mixnet_handling::receiver::connection_handler::ConnectionHandle use crate::node::statistics::collector::GatewayStatisticsCollector; use crate::node::storage::Storage; use log::*; -use mixnet_client::forwarder::{MixForwardingSender, PacketForwarder}; use nym_bin_common::output_format::OutputFormat; use nym_crypto::asymmetric::{encryption, identity}; +use nym_mixnet_client::forwarder::{MixForwardingSender, PacketForwarder}; use nym_network_defaults::NymNetworkDetails; use nym_statistics_common::collector::StatisticsSender; use nym_task::{TaskClient, TaskManager}; diff --git a/mixnode/Cargo.toml b/mixnode/Cargo.toml index a7255a2814..890427ea6e 100644 --- a/mixnode/Cargo.toml +++ b/mixnode/Cargo.toml @@ -47,8 +47,8 @@ opentelemetry = { version = "0.19.0", optional = true } nym-config = { path = "../common/config" } nym-crypto = { path = "../common/crypto" } nym-contracts-common = { path = "../common/cosmwasm-smart-contracts/contracts-common" } -mixnet-client = { path = "../common/client-libs/mixnet-client" } -mixnode-common = { path = "../common/mixnode-common" } +nym-mixnet-client = { path = "../common/client-libs/mixnet-client" } +nym-mixnode-common = { path = "../common/mixnode-common" } nym-nonexhaustive-delayqueue = { path = "../common/nonexhaustive-delayqueue" } nym-sphinx = { path = "../common/nymsphinx" } nym-pemstore = { path = "../common/pemstore", version = "0.2.0" } @@ -72,7 +72,7 @@ nym-sphinx-params = { path = "../common/nymsphinx/params" } [features] cpucycles = [ - "mixnode-common/cpucycles", + "nym-mixnode-common/cpucycles", "tracing", "opentelemetry", "nym-bin-common/tracing", diff --git a/mixnode/src/main.rs b/mixnode/src/main.rs index ca1780a0cf..066d4a061e 100644 --- a/mixnode/src/main.rs +++ b/mixnode/src/main.rs @@ -7,14 +7,14 @@ extern crate rocket; use ::nym_config::defaults::setup_env; use clap::{crate_name, crate_version, Parser}; use lazy_static::lazy_static; -#[cfg(feature = "cpucycles")] -use mixnode_common::measure; use nym_bin_common::build_information::BinaryBuildInformation; #[allow(unused_imports)] use nym_bin_common::logging::{maybe_print_banner, setup_logging}; #[cfg(feature = "cpucycles")] use nym_bin_common::setup_tracing; #[cfg(feature = "cpucycles")] +use nym_mixnode_common::measure; +#[cfg(feature = "cpucycles")] use tracing::instrument; mod commands; mod config; diff --git a/mixnode/src/node/http/verloc.rs b/mixnode/src/node/http/verloc.rs index 8a5c8346f7..ff26a1b52d 100644 --- a/mixnode/src/node/http/verloc.rs +++ b/mixnode/src/node/http/verloc.rs @@ -1,4 +1,4 @@ -use mixnode_common::verloc::{AtomicVerlocResult, VerlocResult}; +use nym_mixnode_common::verloc::{AtomicVerlocResult, VerlocResult}; use rocket::serde::json::Json; use rocket::State; diff --git a/mixnode/src/node/listener/connection_handler/mod.rs b/mixnode/src/node/listener/connection_handler/mod.rs index 1e12075c13..ed08d8c407 100644 --- a/mixnode/src/node/listener/connection_handler/mod.rs +++ b/mixnode/src/node/listener/connection_handler/mod.rs @@ -7,7 +7,7 @@ use crate::node::listener::connection_handler::packet_processing::{ use crate::node::packet_delayforwarder::PacketDelayForwardSender; use crate::node::TaskClient; use futures::StreamExt; -use mixnode_common::measure; +use nym_mixnode_common::measure; use nym_sphinx::forwarding::packet::MixPacket; use nym_sphinx::framing::codec::SphinxCodec; use nym_sphinx::framing::packet::FramedSphinxPacket; diff --git a/mixnode/src/node/listener/connection_handler/packet_processing.rs b/mixnode/src/node/listener/connection_handler/packet_processing.rs index 06580031a9..9ecf8ad435 100644 --- a/mixnode/src/node/listener/connection_handler/packet_processing.rs +++ b/mixnode/src/node/listener/connection_handler/packet_processing.rs @@ -2,10 +2,10 @@ // SPDX-License-Identifier: Apache-2.0 use crate::node::node_statistics; -use mixnode_common::packet_processor::error::MixProcessingError; -pub use mixnode_common::packet_processor::processor::MixProcessingResult; -use mixnode_common::packet_processor::processor::SphinxPacketProcessor; use nym_crypto::asymmetric::encryption; +use nym_mixnode_common::packet_processor::error::MixProcessingError; +pub use nym_mixnode_common::packet_processor::processor::MixProcessingResult; +use nym_mixnode_common::packet_processor::processor::SphinxPacketProcessor; use nym_sphinx::framing::packet::FramedSphinxPacket; // PacketProcessor contains all data required to correctly unwrap and forward sphinx packets diff --git a/mixnode/src/node/mod.rs b/mixnode/src/node/mod.rs index 1d2861b75e..a1c11d202d 100644 --- a/mixnode/src/node/mod.rs +++ b/mixnode/src/node/mod.rs @@ -16,11 +16,11 @@ use crate::node::listener::Listener; use crate::node::node_description::NodeDescription; use crate::node::node_statistics::SharedNodeStats; use crate::node::packet_delayforwarder::{DelayForwarder, PacketDelayForwardSender}; -use mixnode_common::verloc::{self, AtomicVerlocResult, VerlocMeasurer}; use nym_bin_common::output_format::OutputFormat; use nym_bin_common::version_checker::parse_version; use nym_config::NymConfig; use nym_crypto::asymmetric::{encryption, identity}; +use nym_mixnode_common::verloc::{self, AtomicVerlocResult, VerlocMeasurer}; use nym_task::{TaskClient, TaskManager}; use rand::seq::SliceRandom; use rand::thread_rng; @@ -173,7 +173,7 @@ impl MixNode { ) -> PacketDelayForwardSender { info!("Starting packet delay-forwarder..."); - let client_config = mixnet_client::Config::new( + let client_config = nym_mixnet_client::Config::new( self.config.get_packet_forwarding_initial_backoff(), self.config.get_packet_forwarding_maximum_backoff(), self.config.get_initial_connection_timeout(), @@ -182,7 +182,7 @@ impl MixNode { ); let mut packet_forwarder = DelayForwarder::new( - mixnet_client::Client::new(client_config), + nym_mixnet_client::Client::new(client_config), node_stats_update_sender, shutdown, ); diff --git a/mixnode/src/node/packet_delayforwarder.rs b/mixnode/src/node/packet_delayforwarder.rs index 332d959ed6..41a3e7e0fa 100644 --- a/mixnode/src/node/packet_delayforwarder.rs +++ b/mixnode/src/node/packet_delayforwarder.rs @@ -21,7 +21,7 @@ type PacketDelayForwardReceiver = mpsc::UnboundedReceiver<(MixPacket, Option where - C: mixnet_client::SendWithoutResponse, + C: nym_mixnet_client::SendWithoutResponse, { delay_queue: NonExhaustiveDelayQueue, mixnet_client: C, @@ -33,7 +33,7 @@ where impl DelayForwarder where - C: mixnet_client::SendWithoutResponse, + C: nym_mixnet_client::SendWithoutResponse, { pub(crate) fn new( client: C, @@ -150,7 +150,7 @@ mod tests { pub packets_sent: Arc>>, } - impl mixnet_client::SendWithoutResponse for TestClient { + impl nym_mixnet_client::SendWithoutResponse for TestClient { fn send_without_response( &mut self, address: NymNodeRoutingAddress, diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index 6ad83b0081..b388d49e36 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -46,7 +46,7 @@ nym-service-providers-common = { path = "../common" } nym-socks5-requests = { path = "../../common/socks5/requests" } nym-statistics-common = { path = "../../common/statistics" } nym-task = { path = "../../common/task" } -websocket-requests = { path = "../../clients/native/websocket-requests" } +nym-client-websocket-requests = { path = "../../clients/native/websocket-requests" } [dev-dependencies] tempfile = "3.5.0" \ No newline at end of file