chore(code): Update to libp2p-tls v0.4.1+

Closes: #269
informalsystems · Jul 19, 2024 · 26a26ca · 26a26ca
1 parent f5ebdf6
commit 26a26ca
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git a/code/Cargo.lock b/code/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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};