From 1169fdf1026628e7b1c1e62bb813861e45147b01 Mon Sep 17 00:00:00 2001 From: Diva M Date: Fri, 8 Nov 2024 12:21:57 -0500 Subject: [PATCH] first udeps pass --- Cargo.lock | 81 ++++--------------------------------------- iroh-relay/Cargo.toml | 63 +++++---------------------------- 2 files changed, 15 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb72ca1878..7b2896caf1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2626,7 +2626,7 @@ dependencies = [ "iroh-io", "iroh-metrics", "iroh-net", - "iroh-quinn 0.12.0", + "iroh-quinn", "iroh-relay", "iroh-router", "iroh-test 0.28.0", @@ -2723,7 +2723,7 @@ dependencies = [ "iroh-io", "iroh-metrics", "iroh-net", - "iroh-quinn 0.12.0", + "iroh-quinn", "iroh-router", "nested_enum_utils", "num_cpus", @@ -3000,8 +3000,8 @@ dependencies = [ "iroh-base", "iroh-metrics", "iroh-net", - "iroh-quinn 0.12.0", - "iroh-quinn-proto 0.12.0", + "iroh-quinn", + "iroh-quinn-proto", "iroh-quinn-udp", "iroh-relay", "iroh-test 0.28.0", @@ -3074,7 +3074,7 @@ dependencies = [ "hdrhistogram", "iroh-metrics", "iroh-net", - "iroh-quinn 0.12.0", + "iroh-quinn", "iroh-relay", "rcgen", "rustls", @@ -3084,24 +3084,6 @@ dependencies = [ "tracing-subscriber", ] -[[package]] -name = "iroh-quinn" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd590a39a14cfc168efa4d894de5039d65641e62d8da4a80733018ababe3c33" -dependencies = [ - "bytes", - "iroh-quinn-proto 0.11.6", - "iroh-quinn-udp", - "pin-project-lite", - "rustc-hash", - "rustls", - "socket2", - "thiserror", - "tokio", - "tracing", -] - [[package]] name = "iroh-quinn" version = "0.12.0" @@ -3109,7 +3091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35ba75a5c57cff299d2d7ca1ddee053f66339d1756bd79ec637bcad5aa61100e" dependencies = [ "bytes", - "iroh-quinn-proto 0.12.0", + "iroh-quinn-proto", "iroh-quinn-udp", "pin-project-lite", "rustc-hash", @@ -3120,24 +3102,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "iroh-quinn-proto" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd0538ff12efe3d61ea1deda2d7913f4270873a519d43e6995c6e87a1558538" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash", - "rustls", - "rustls-platform-verifier", - "slab", - "thiserror", - "tinyvec", - "tracing", -] - [[package]] name = "iroh-quinn-proto" version = "0.12.0" @@ -3174,22 +3138,15 @@ name = "iroh-relay" version = "0.1.0" dependencies = [ "anyhow", - "axum", - "backoff", "base64 0.22.1", "bytes", "clap", - "criterion", "crypto_box", - "der", "derive_more", "duct", - "futures-buffered", - "futures-concurrency", "futures-lite 2.4.0", "futures-sink", "futures-util", - "genawaiter", "governor", "hex", "hickory-proto 0.25.0-alpha.2", @@ -3199,29 +3156,15 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "igd-next", "iroh-base", "iroh-metrics", - "iroh-quinn 0.11.3", - "iroh-quinn-proto 0.11.6", - "iroh-quinn-udp", "iroh-test 0.27.0", "libc", - "mainline", - "netdev", - "netlink-packet-core", - "netlink-packet-route", - "netlink-sys", - "netwatch", - "ntest", "num_enum", "once_cell", "parking_lot", "pin-project", - "pkarr", - "portmapper", "postcard", - "pretty_assertions", "proptest", "rand", "rand_chacha", @@ -3229,7 +3172,6 @@ dependencies = [ "regex", "reqwest", "ring", - "rtnetlink", "rustls", "rustls-pemfile", "rustls-webpki", @@ -3237,17 +3179,12 @@ dependencies = [ "serde_json", "smallvec", "socket2", - "strum 0.26.3", "stun-rs", - "surge-ping", - "swarm-discovery", - "testresult", "thiserror", "time", "tokio", "tokio-rustls", "tokio-rustls-acme", - "tokio-stream", "tokio-tungstenite", "tokio-tungstenite-wasm", "tokio-util", @@ -3256,12 +3193,8 @@ dependencies = [ "tracing-subscriber", "tungstenite", "url", - "watchable", "webpki-roots", - "windows 0.51.1", - "wmi", "x509-parser", - "z32", ] [[package]] @@ -4588,7 +4521,7 @@ dependencies = [ "futures-sink", "futures-util", "hex", - "iroh-quinn 0.12.0", + "iroh-quinn", "pin-project", "serde", "slab", diff --git a/iroh-relay/Cargo.toml b/iroh-relay/Cargo.toml index ac5fe6a9e9..9dea38d31d 100644 --- a/iroh-relay/Cargo.toml +++ b/iroh-relay/Cargo.toml @@ -8,13 +8,10 @@ workspace = true [dependencies] anyhow = { version = "1" } -backoff = "0.4.0" base64 = "0.22.1" bytes = "1.7" -der = { version = "0.7", features = ["alloc", "derive"] } +clap = { version = "4", features = ["derive"], optional = true } derive_more = { version = "1.0.0", features = ["debug", "display", "from", "try_into", "deref"] } -futures-buffered = "0.2.8" -futures-concurrency = "7.6.0" futures-lite = "2.3" futures-sink = "0.3.25" futures-util = "0.3.25" @@ -27,101 +24,59 @@ http = "1" http-body-util = "0.1.0" hyper = { version = "1", features = ["server", "client", "http1"] } hyper-util = "0.1.1" -igd-next = { version = "0.15.1", features = ["aio_tokio"] } iroh-base = { version = "0.28.0", features = ["key"] } +iroh-metrics = { version = "0.28.0", default-features = false } libc = "0.2.139" -netdev = "0.30.0" -netwatch = { version = "0.1.0", path = "../net-tools/netwatch" } num_enum = "0.7" once_cell = "1.18.0" parking_lot = "0.12.1" pin-project = "1" -pkarr = { version = "2", default-features = false, features = ["async", "relay"] } -portmapper = { path = "../net-tools/portmapper" } postcard = { version = "1", default-features = false, features = ["alloc", "use-std", "experimental-derive"] } -quinn = { package = "iroh-quinn", version = "0.11" } -quinn-proto = { package = "iroh-quinn-proto", version = "0.11" } -quinn-udp = { package = "iroh-quinn-udp", version = "0.5" } rand = "0.8" rcgen = "0.12" +regex = { version = "1.7.1", optional = true } reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"] } ring = "0.17" rustls = { version = "0.23", default-features = false, features = ["ring"] } +rustls-pemfile = { version = "2.1", optional = true } serde = { version = "1", features = ["derive", "rc"] } smallvec = "1.11.1" socket2 = "0.5.3" stun-rs = "0.1.5" -surge-ping = "0.8.0" thiserror = "1" time = "0.3.20" tokio = { version = "1", features = ["io-util", "macros", "sync", "rt", "net", "fs", "io-std", "signal", "process"] } tokio-rustls = { version = "0.26", default-features = false, features = ["logging", "ring"] } -tokio-stream = { version = "0.1.15" } +tokio-rustls-acme = { version = "0.4", optional = true } tokio-tungstenite = "0.21" tokio-tungstenite-wasm = "0.3" tokio-util = { version = "0.7.12", features = ["io-util", "io", "codec", "rt"] } +toml = { version = "0.8", optional = true } tracing = "0.1" +tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true } tungstenite = "0.21" url = { version = "2.4", features = ["serde"] } -watchable = "1.1.2" webpki = { package = "rustls-webpki", version = "0.102" } webpki-roots = "0.26" x509-parser = "0.16" -z32 = "1.0.3" - -# server -axum = { version = "0.7.4", optional = true } -clap = { version = "4", features = ["derive"], optional = true } -regex = { version = "1.7.1", optional = true } -rustls-pemfile = { version = "2.1", optional = true } -toml = { version = "0.8", optional = true } -tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = true } -tokio-rustls-acme = { version = "0.4", optional = true } - -# metrics -iroh-metrics = { version = "0.28.0", default-features = false } -strum = { version = "0.26.2", features = ["derive"] } - -# local-swarm-discovery -swarm-discovery = { version = "0.2.1", optional = true } - -# dht_discovery -genawaiter = { version = "0.99.1", features = ["futures03"], optional = true } - -[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies] -netlink-packet-core = "0.7.0" -netlink-packet-route = "0.17.0" -netlink-sys = "0.8.5" -rtnetlink = "0.13.0" - -[target.'cfg(target_os = "windows")'.dependencies] -wmi = "0.13" -windows = { version = "0.51", features = ["Win32_NetworkManagement_IpHelper", "Win32_Foundation", "Win32_NetworkManagement_Ndis", "Win32_Networking_WinSock"] } [dev-dependencies] -axum = { version = "0.7.4" } clap = { version = "4", features = ["derive"] } -criterion = "0.5.1" crypto_box = { version = "0.9.1", features = ["serde", "chacha20"] } -ntest = "0.9" -pretty_assertions = "1.4" proptest = "1.2.0" rand_chacha = "0.3.1" tokio = { version = "1", features = ["io-util", "sync", "rt", "net", "fs", "macros", "time", "test-util"] } tracing-subscriber = { version = "0.3", features = ["env-filter"] } iroh-test = "0.27.0" serde_json = "1.0.107" -testresult = "0.4.0" -mainline = "2.0.1" [build-dependencies] duct = "0.13.6" [features] -default = ["metrics", "discovery-pkarr-dht", "server", "client"] +default = ["metrics", "server", "client"] server = [ "dep:tokio-rustls-acme", - "dep:axum", "dep:clap", "dep:toml", "dep:rustls-pemfile", @@ -130,8 +85,6 @@ server = [ ] metrics = ["iroh-metrics/metrics", "server"] test-utils = [] -discovery-local-network = ["dep:swarm-discovery"] -discovery-pkarr-dht = ["pkarr/dht", "dep:genawaiter"] client = [] [[bin]]