From 30da87bf4105947740c80f8906ef3f7edf71c9ed Mon Sep 17 00:00:00 2001 From: mfahampshire Date: Fri, 30 Jan 2026 16:02:07 +0000 Subject: [PATCH] Fix network-requester Cargo.toml after rebase --- .../network-requester/Cargo.toml | 32 ++----------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/service-providers/network-requester/Cargo.toml b/service-providers/network-requester/Cargo.toml index c073d0a974..d544bc4cad 100644 --- a/service-providers/network-requester/Cargo.toml +++ b/service-providers/network-requester/Cargo.toml @@ -38,11 +38,14 @@ tap = { workspace = true } thiserror = { workspace = true } tokio = { workspace = true, features = ["net", "rt-multi-thread", "macros"] } tokio-tungstenite = { workspace = true } +tokio-util = { workspace = true } url = { workspace = true } time = { workspace = true } zeroize = { workspace = true } # internal +nym-async-file-watcher = { workspace = true } +nym-bin-common = { workspace = true, features = ["output_format", "clap", "basic_tracing"] } nym-client-core = { workspace = true, features = ["cli", "fs-gateways-storage", "fs-surb-storage"] } nym-client-websocket-requests = { workspace = true } nym-config = { workspace = true } @@ -60,35 +63,6 @@ nym-task = { workspace = true } nym-types = { workspace = true } nym-exit-policy = { workspace = true, features = ["client"] } nym-id = { workspace = true } -======= - - -nym-async-file-watcher = { path = "../../common/async-file-watcher" } -nym-client-core = { path = "../../common/client-core", features = [ - "cli", - "fs-gateways-storage", - "fs-surb-storage", -] } -nym-bin-common = { path = "../../common/bin-common", features = [ - "output_format", -] } -nym-client-websocket-requests = { path = "../../clients/native/websocket-requests" } -nym-config = { path = "../../common/config" } -nym-credentials = { path = "../../common/credentials" } -nym-credential-storage = { path = "../../common/credential-storage" } -nym-crypto = { path = "../../common/crypto" } -nym-network-defaults = { path = "../../common/network-defaults" } -nym-ordered-buffer = { path = "../../common/socks5/ordered-buffer" } -nym-sdk = { path = "../../sdk/rust/nym-sdk" } -nym-service-providers-common = { path = "../common" } -nym-socks5-proxy-helpers = { path = "../../common/socks5/proxy-helpers" } -nym-socks5-requests = { path = "../../common/socks5/requests" } -nym-sphinx = { path = "../../common/nymsphinx" } -nym-task = { path = "../../common/task" } -nym-types = { path = "../../common/types" } -nym-exit-policy = { path = "../../common/exit-policy", features = ["client"] } -nym-id = { path = "../../common/nym-id" } ->>>>>>> 76c3fb42d (Update service providers for &mut self send signature) [dev-dependencies] tempfile = { workspace = true }