diff --git a/code/Cargo.lock b/code/Cargo.lock index b5e26b920..073219b5b 100644 --- a/code/Cargo.lock +++ b/code/Cargo.lock @@ -1964,9 +1964,9 @@ dependencies = [ [[package]] name = "libp2p-tls" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "251b17aebdd29df7e8f80e4d94b782fae42e934c49086e1a81ba23b60a8314f2" +checksum = "72b7b831e55ce2aa6c354e6861a85fdd4dd0a2b97d5e276fabac0e4810a71776" dependencies = [ "futures", "futures-rustls", @@ -2144,13 +2144,13 @@ dependencies = [ "derive-where", "futures", "libp2p", + "libp2p-tls", "malachite-common", "malachite-consensus", "malachite-metrics", "malachite-proto", "prost", "prost-types", - "rustls", "tokio", "tracing", ] @@ -2162,6 +2162,7 @@ dependencies = [ "blake3", "futures", "libp2p", + "libp2p-tls", "malachite-metrics", "malachite-proto", "prost", diff --git a/code/Cargo.toml b/code/Cargo.toml index d622786b4..a717a0e82 100644 --- a/code/Cargo.toml +++ b/code/Cargo.toml @@ -63,6 +63,7 @@ humantime-serde = "1.1.1" itertools = "0.13" itf = "0.2.3" libp2p = { version = "0.53.2", features = ["macros", "mdns", "identify", "tokio", "ed25519", "quic", "gossipsub", "dns", "ping", "metrics"] } +libp2p-tls = "0.4.1" # https://github.com/informalsystems/malachite/issues/269 libp2p-identity = "0.2.9" multiaddr = "0.18.1" num-bigint = "0.4.4" @@ -89,6 +90,3 @@ toml = "0.8.10" tracing = "0.1.40" tracing-subscriber = "0.3.18" tempfile = "3.10.1" - -# https://github.com/libp2p/rust-libp2p/issues/5487 -rustls = { version = "=0.23.10", default-features = false } diff --git a/code/crates/gossip-consensus/Cargo.toml b/code/crates/gossip-consensus/Cargo.toml index be715cfb0..13517f3e7 100644 --- a/code/crates/gossip-consensus/Cargo.toml +++ b/code/crates/gossip-consensus/Cargo.toml @@ -19,10 +19,8 @@ blake3 = { workspace = true } derive-where = { workspace = true } futures = { workspace = true } libp2p = { workspace = true } +libp2p-tls = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } - -# https://github.com/libp2p/rust-libp2p/issues/5487 -rustls = { workspace = true } diff --git a/code/crates/gossip-consensus/src/lib.rs b/code/crates/gossip-consensus/src/lib.rs index 13e43f464..c65079e80 100644 --- a/code/crates/gossip-consensus/src/lib.rs +++ b/code/crates/gossip-consensus/src/lib.rs @@ -13,12 +13,10 @@ use futures::StreamExt; use libp2p::metrics::{Metrics, Recorder}; use libp2p::swarm::{self, SwarmEvent}; use libp2p::{gossipsub, identify, SwarmBuilder}; +use libp2p_tls as _; // https://github.com/informalsystems/malachite/issues/269 use tokio::sync::mpsc; use tracing::{debug, error, error_span, trace, Instrument}; -// To make lint CI happy, remove once https://github.com/libp2p/rust-libp2p/issues/5487 is resolved -pub use rustls; - use malachite_common::Context; use malachite_metrics::SharedRegistry; diff --git a/code/crates/gossip-mempool/Cargo.toml b/code/crates/gossip-mempool/Cargo.toml index 8ce97751e..a88228b0e 100644 --- a/code/crates/gossip-mempool/Cargo.toml +++ b/code/crates/gossip-mempool/Cargo.toml @@ -16,6 +16,7 @@ malachite-proto = { workspace = true } blake3 = { workspace = true } futures = { workspace = true } libp2p = { workspace = true } +libp2p-tls = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } tokio = { workspace = true } diff --git a/code/crates/gossip-mempool/src/lib.rs b/code/crates/gossip-mempool/src/lib.rs index bddd79866..1c247a25e 100644 --- a/code/crates/gossip-mempool/src/lib.rs +++ b/code/crates/gossip-mempool/src/lib.rs @@ -11,6 +11,7 @@ use std::time::Duration; use futures::StreamExt; use libp2p::swarm::{self, SwarmEvent}; use libp2p::{gossipsub, identify, SwarmBuilder}; +use libp2p_tls as _; // https://github.com/informalsystems/malachite/issues/269 use tokio::sync::mpsc; use tracing::{debug, error, error_span, trace, Instrument};