diff --git a/Cargo.lock b/Cargo.lock index f209f747c1..7dcda78a48 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2049,12 +2049,12 @@ dependencies = [ "iroh-base", "iroh-metrics", "iroh-net-report", - "iroh-quinn 0.13.0", - "iroh-quinn-proto 0.13.0", + "iroh-quinn", + "iroh-quinn-proto", "iroh-quinn-udp", "iroh-relay", "iroh-test 0.31.0", - "n0-future 0.1.1", + "n0-future", "netdev", "netwatch", "parse-size", @@ -2120,8 +2120,8 @@ dependencies = [ "hdrhistogram", "iroh", "iroh-metrics", - "iroh-quinn 0.13.0", - "n0-future 0.1.1", + "iroh-quinn", + "n0-future", "rcgen", "rustls", "tokio", @@ -2152,7 +2152,7 @@ dependencies = [ "iroh-metrics", "iroh-test 0.31.0", "lru", - "n0-future 0.1.1", + "n0-future", "pkarr", "rand", "rand_chacha", @@ -2211,11 +2211,10 @@ dependencies = [ "hickory-resolver", "iroh-base", "iroh-metrics", - "iroh-quinn 0.12.0", - "iroh-quinn 0.13.0", + "iroh-quinn", "iroh-relay", "iroh-test 0.31.0", - "n0-future 0.1.1", + "n0-future", "netwatch", "portmapper", "pretty_assertions", @@ -2231,24 +2230,6 @@ dependencies = [ "url", ] -[[package]] -name = "iroh-quinn" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ba75a5c57cff299d2d7ca1ddee053f66339d1756bd79ec637bcad5aa61100e" -dependencies = [ - "bytes", - "iroh-quinn-proto 0.12.0", - "iroh-quinn-udp", - "pin-project-lite", - "rustc-hash", - "rustls", - "socket2", - "thiserror 1.0.69", - "tokio", - "tracing", -] - [[package]] name = "iroh-quinn" version = "0.13.0" @@ -2257,7 +2238,7 @@ checksum = "76c6245c9ed906506ab9185e8d7f64857129aee4f935e899f398a3bd3b70338d" dependencies = [ "bytes", "cfg_aliases", - "iroh-quinn-proto 0.13.0", + "iroh-quinn-proto", "iroh-quinn-udp", "pin-project-lite", "rustc-hash", @@ -2269,24 +2250,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "iroh-quinn-proto" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c869ba52683d3d067c83ab4c00a2fda18eaf13b1434d4c1352f428674d4a5d" -dependencies = [ - "bytes", - "rand", - "ring", - "rustc-hash", - "rustls", - "rustls-platform-verifier 0.3.4", - "slab", - "thiserror 1.0.69", - "tinyvec", - "tracing", -] - [[package]] name = "iroh-quinn-proto" version = "0.13.0" @@ -2300,7 +2263,7 @@ dependencies = [ "rustc-hash", "rustls", "rustls-pki-types", - "rustls-platform-verifier 0.5.0", + "rustls-platform-verifier", "slab", "thiserror 2.0.11", "tinyvec", @@ -2343,11 +2306,11 @@ dependencies = [ "hyper-util", "iroh-base", "iroh-metrics", - "iroh-quinn 0.13.0", - "iroh-quinn-proto 0.13.0", + "iroh-quinn", + "iroh-quinn-proto", "iroh-test 0.31.0", "lru", - "n0-future 0.0.1", + "n0-future", "num_enum", "pin-project", "postcard", @@ -2435,20 +2398,6 @@ version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror 1.0.69", - "walkdir", -] - [[package]] name = "jni" version = "0.21.1" @@ -2703,27 +2652,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "n0-future" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b3faeb9b9f692be348d7c2b41686cf697f4ff40a4811b6ecf4e09fde291ebfc" -dependencies = [ - "cfg_aliases", - "derive_more", - "futures-buffered", - "futures-lite", - "futures-util", - "js-sys", - "pin-project", - "send_wrapper", - "tokio", - "tokio-util", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-time", -] - [[package]] name = "nanorand" version = "0.7.0" @@ -3956,19 +3884,6 @@ dependencies = [ "thiserror 2.0.11", ] -[[package]] -name = "rustls-native-certs" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" -dependencies = [ - "openssl-probe", - "rustls-pemfile", - "rustls-pki-types", - "schannel", - "security-framework 2.11.1", -] - [[package]] name = "rustls-native-certs" version = "0.8.1" @@ -3978,7 +3893,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.2.0", + "security-framework", ] [[package]] @@ -3999,27 +3914,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490" -dependencies = [ - "core-foundation 0.9.4", - "core-foundation-sys", - "jni 0.19.0", - "log", - "once_cell", - "rustls", - "rustls-native-certs 0.7.3", - "rustls-platform-verifier-android", - "rustls-webpki", - "security-framework 2.11.1", - "security-framework-sys", - "webpki-roots", - "winapi", -] - [[package]] name = "rustls-platform-verifier" version = "0.5.0" @@ -4028,14 +3922,14 @@ checksum = "e012c45844a1790332c9386ed4ca3a06def221092eda277e6f079728f8ea99da" dependencies = [ "core-foundation 0.10.0", "core-foundation-sys", - "jni 0.21.1", + "jni", "log", "once_cell", "rustls", - "rustls-native-certs 0.8.1", + "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.2.0", + "security-framework", "security-framework-sys", "webpki-root-certs", "windows-sys 0.52.0", @@ -4121,20 +4015,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "security-framework" -version = "2.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" -dependencies = [ - "bitflags 2.7.0", - "core-foundation 0.9.4", - "core-foundation-sys", - "libc", - "num-bigint", - "security-framework-sys", -] - [[package]] name = "security-framework" version = "3.2.0" diff --git a/iroh-net-report/Cargo.toml b/iroh-net-report/Cargo.toml index 0a945dbc6f..00a00370cf 100644 --- a/iroh-net-report/Cargo.toml +++ b/iroh-net-report/Cargo.toml @@ -28,7 +28,7 @@ rand = "0.8" reqwest = { version = "0.12", default-features = false, features = ["stream"] } rustls = { version = "0.23", default-features = false } thiserror = "2" -tokio = { version = "1", default-features = false, features = ["sync", "time", "macros"] } +tokio = { version = "1", default-features = false, features = ["sync", "time", "macros", "rt"] } tokio-util = { version = "0.7.12", default-features = false } tracing = "0.1" url = { version = "2.4" } @@ -39,7 +39,6 @@ hickory-resolver = "=0.25.0-alpha.4" netwatch = { version = "0.3" } portmapper = { version = "0.3", default-features = false } surge-ping = "0.8.0" -tokio = { version = "1", default-features = false, features = ["sync", "time", "macros", "rt"] } [dev-dependencies] futures-lite = "2.3"