Skip to content

Commit 7ed96f0

Browse files
lexnvImod7
authored andcommitted
features: Move quic related dependencies under feature flag (#359)
The following crates are made optional, depending on the Quic feature flag: - ring - rustls This effectively ensures that litep2p is not leaking outdated dependencies for experimental features (ie quic). Closes: #330 cc @paritytech/networking --------- Signed-off-by: Alexandru Vasile <[email protected]>
1 parent 89fc4c4 commit 7ed96f0

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

Cargo.toml

+6-9
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ network-interface = "1.1.1"
2626
parking_lot = "0.12.3"
2727
pin-project = "1.1.0"
2828
prost = "0.12.6"
29-
quinn = { version = "0.9.3", default-features = false, features = ["tls-rustls", "runtime-tokio"], optional = true }
3029
rand = { version = "0.8.0", features = ["getrandom"] }
3130
rcgen = "0.10.0"
32-
ring = "0.16.20"
3331
serde = "1.0.158"
3432
sha2 = "0.10.8"
3533
simple-dns = "0.9.3"
@@ -47,18 +45,17 @@ hickory-resolver = "0.24.2"
4745
uint = "0.10.0"
4846
unsigned-varint = { version = "0.8.0", features = ["codec"] }
4947
url = "2.5.4"
50-
webpki = { version = "0.22.4", optional = true }
5148
x25519-dalek = "2.0.1"
5249
x509-parser = "0.17.0"
5350
yasna = "0.5.0"
5451
zeroize = "1.8.1"
5552
yamux = "0.13.4"
5653

57-
# Exposed dependencies. Breaking changes to these are breaking changes to us.
58-
[dependencies.rustls]
59-
version = "0.20.7"
60-
default-features = false
61-
features = ["dangerous_configuration"] # Must enable this to allow for custom verification code.
54+
# Quic related dependencies. Quic is an experimental feature flag. The dependencies must be updated.
55+
quinn = { version = "0.9.3", default-features = false, features = ["tls-rustls", "runtime-tokio"], optional = true }
56+
rustls = { version = "0.20.7", default-features = false, features = ["dangerous_configuration"], optional = true }
57+
ring = { version = "0.16.20", optional = true }
58+
webpki = { version = "0.22.4", optional = true }
6259

6360
[dev-dependencies]
6461
asynchronous-codec = "0.7.0"
@@ -86,7 +83,7 @@ futures_ringbuf = "0.4.0"
8683

8784
[features]
8885
custom_sc_network = []
89-
quic = ["dep:webpki", "dep:quinn"]
86+
quic = ["dep:webpki", "dep:quinn", "dep:rustls", "dep:ring"]
9087
webrtc = ["dep:str0m"]
9188
websocket = ["dep:tokio-tungstenite"]
9289

src/multistream_select/dialer_select.rs

-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use crate::{
3535

3636
use bytes::BytesMut;
3737
use futures::prelude::*;
38-
use rustls::internal::msgs::hsjoiner::HandshakeJoiner;
3938
use std::{
4039
convert::TryFrom as _,
4140
iter, mem,

0 commit comments

Comments
 (0)