Skip to content

Commit 566d7eb

Browse files
authored
chore(iroh, iroh-relay): Avoid a duplicate tungstenite dependency (#3006)
## Description Before we used to depend on both tungstenite version 0.21 as well as 0.24, because: ``` tungstenite v0.21.0 └── tokio-tungstenite v0.21.0 └── tokio-tungstenite-wasm v0.3.1 ├── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) └── iroh-relay v0.29.0 (/home/philipp/program/work/iroh/iroh-relay) ├── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) └── iroh-net-report v0.29.0 (/home/philipp/program/work/iroh/iroh-net-report) └── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) tungstenite v0.24.0 └── tokio-tungstenite v0.24.0 ├── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) └── iroh-relay v0.29.0 (/home/philipp/program/work/iroh/iroh-relay) ├── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) └── iroh-net-report v0.29.0 (/home/philipp/program/work/iroh/iroh-net-report) └── iroh v0.29.0 (/home/philipp/program/work/iroh/iroh) ``` Basically, `tokio-tungstenite-wasm` pulls in `0.21` and there's no newer version of it yet. But we updated all our dependencies including `tungstenite`, duplicating it. ## Notes & open questions <!-- Any notes, remarks or open questions you have to make about the PR. --> I want this to be temporary until we can finally switch to `fasterwebsockets` entirely once it implements [`poll`-based methods](denoland/fastwebsockets#78) (but I worry the project's maintenance is ... unclear). I checked the [tungstenite changelog](https://github.com/snapview/tungstenite-rs/blob/master/CHANGELOG.md), and it doesn't look like there's anything critical in there. The `rustls` update doesn't affect us - we don't duplicate rustls versions after this rollback. ## Change checklist - [x] Self-review. - [x] Documentation updates following the [style guide](https://rust-lang.github.io/rfcs/1574-more-api-documentation-conventions.html#appendix-a-full-conventions-text), if relevant. - ~~[ ] Tests if relevant.~~ - [x] All breaking changes documented.
1 parent f75a04b commit 566d7eb

File tree

3 files changed

+6
-36
lines changed

3 files changed

+6
-36
lines changed

Cargo.lock

Lines changed: 4 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

iroh-relay/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ tokio-rustls = { version = "0.26", default-features = false, features = [
8383
"ring",
8484
] }
8585
tokio-rustls-acme = { version = "0.6", optional = true }
86-
tokio-tungstenite = "0.24"
86+
tokio-tungstenite = "0.21" # avoid duplicating this dependency as long as tokio-tungstenite-wasm isn't updated
8787
tokio-tungstenite-wasm = "0.3"
8888
tokio-util = { version = "0.7", features = ["io-util", "io", "codec", "rt"] }
8989
toml = { version = "0.8", optional = true }

iroh/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ tokio-rustls = { version = "0.26", default-features = false, features = [
9797
"ring",
9898
] }
9999
tokio-stream = { version = "0.1.15" }
100-
tokio-tungstenite = "0.24"
100+
tokio-tungstenite = "0.21" # avoid duplicating this dependency as long as tokio-tungstenite-wasm isn't updated
101101
tokio-tungstenite-wasm = "0.3"
102102
tokio-util = { version = "0.7", features = ["io-util", "io", "codec", "rt"] }
103103
tracing = "0.1"

0 commit comments

Comments
 (0)