Merge branch 'master' of github.com:libp2p/rust-libp2p into add-rusttoml

jxs · jxs · commit 8ea3a30a6c4e · 2024-11-28T15:17:48.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -72,9 +72,6 @@ resolver = "2"
 rust-version = "1.75.0"
 
 [workspace.dependencies]
-asynchronous-codec = { version = "0.7.0" }
-futures-bounded = { version = "0.2.4" }
-futures-rustls = { version = "0.26.0", default-features = false }
 libp2p = { version = "0.54.2", path = "libp2p" }
 libp2p-allow-block-list = { version = "0.4.2", path = "misc/allow-block-list" }
 libp2p-autonat = { version = "0.13.1", path = "protocols/autonat" }
@@ -91,7 +88,7 @@ libp2p-mdns = { version = "0.46.0", path = "protocols/mdns" }
 libp2p-memory-connection-limits = { version = "0.3.1", path = "misc/memory-connection-limits" }
 libp2p-metrics = { version = "0.15.0", path = "misc/metrics" }
 libp2p-mplex = { version = "0.42.0", path = "muxers/mplex" }
-libp2p-noise = { version = "0.45.0", path = "transports/noise" }
+libp2p-noise = { version = "0.45.1", path = "transports/noise" }
 libp2p-perf = { version = "0.4.0", path = "protocols/perf" }
 libp2p-ping = { version = "0.45.1", path = "protocols/ping" }
 libp2p-plaintext = { version = "0.42.0", path = "transports/plaintext" }
@@ -114,23 +111,29 @@ libp2p-webrtc-utils = { version = "0.3.0", path = "misc/webrtc-utils" }
 libp2p-webrtc-websys = { version = "0.4.0-alpha.2", path = "transports/webrtc-websys" }
 libp2p-websocket = { version = "0.44.1", path = "transports/websocket" }
 libp2p-websocket-websys = { version = "0.4.1", path = "transports/websocket-websys" }
-libp2p-webtransport-websys = { version = "0.4.0", path = "transports/webtransport-websys" }
+libp2p-webtransport-websys = { version = "0.4.1", path = "transports/webtransport-websys" }
 libp2p-yamux = { version = "0.46.0", path = "muxers/yamux" }
+
+# External dependencies
+asynchronous-codec = { version = "0.7.0" }
+futures = "0.3.30"
+futures-bounded = { version = "0.2.4" }
+futures-rustls = { version = "0.26.0", default-features = false }
 multiaddr = "0.18.1"
 multihash = "0.19.1"
 multistream-select = { version = "0.13.0", path = "misc/multistream-select" }
 prometheus-client = "0.22.2"
 quick-protobuf-codec = { version = "0.3.1", path = "misc/quick-protobuf-codec" }
 quickcheck = { package = "quickcheck-ext", path = "misc/quickcheck-ext" }
+rcgen = "0.11.3"
+ring = "0.17.8"
 rw-stream-sink = { version = "0.4.0", path = "misc/rw-stream-sink" }
-unsigned-varint = { version = "0.8.0" }
+thiserror = "2"
 tokio = { version = "1.38", default-features = false }
 tracing = "0.1.37"
 tracing-subscriber = "0.3"
-futures = "0.3.30"
+unsigned-varint = { version = "0.8.0" }
 web-time = "1.1.0"
-ring = "0.17.8"
-rcgen = "0.11.3"
 
 [patch.crates-io]
 
diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md
@@ -7,7 +7,7 @@
 
 - Update `Transport::dial` function signature with a `DialOpts` param and remove `Transport::dial_as_listener`:
   - `DialOpts` struct contains `PortUse` and `Endpoint`, 
-  - `PortUse` allows controling port allocation of new connections (defaults to `PortUse::Reuse`)   - 
+  - `PortUse` allows controlling port allocation of new connections (defaults to `PortUse::Reuse`)   - 
   - Add `port_use` field to `ConnectedPoint`
   - Set `endpoint` field in `DialOpts` to `Endpoint::Listener` to dial as a listener
 - Remove `Transport::address_translation` and relocate functionality to `libp2p_swarm`
diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -28,7 +28,7 @@ rand = "0.8"
 rw-stream-sink = { workspace = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 smallvec = "1.13.2"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 unsigned-varint = { workspace = true }
 
diff --git a/identity/CHANGELOG.md b/identity/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 ## 0.2.8
 
-- Bump `ring` to `0.17.5.
+- Bump `ring` to `0.17.5`.
   See [PR 4779](https://github.com/libp2p/rust-libp2p/pull/4779).
 
 ## 0.2.7
diff --git a/identity/Cargo.toml b/identity/Cargo.toml
@@ -25,7 +25,7 @@ rand = { version = "0.8", optional = true }
 sec1 = { version = "0.7", default-features = false, optional = true }
 serde = { version = "1", optional = true, features = ["derive"] }
 sha2 = { version = "0.10.8", optional = true }
-thiserror = { version = "1.0", optional = true }
+thiserror = { workspace = true, optional = true }
 zeroize = { version = "1.8", optional = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml
@@ -122,7 +122,7 @@ libp2p-webtransport-websys = { workspace = true, optional = true }
 libp2p-yamux = { workspace = true, optional = true }
 multiaddr = { workspace = true }
 pin-project = "1.0.0"
-thiserror = "1.0"
+thiserror = { workspace = true }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 libp2p-dns = { workspace = true, optional = true }
diff --git a/misc/quick-protobuf-codec/Cargo.toml b/misc/quick-protobuf-codec/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["asynchronous"]
 [dependencies]
 asynchronous-codec = { workspace = true }
 bytes = { version = "1" }
-thiserror = "1.0"
+thiserror = { workspace = true }
 unsigned-varint = { workspace = true, features = ["std"] }
 quick-protobuf = "0.8"
 
diff --git a/misc/webrtc-utils/Cargo.toml b/misc/webrtc-utils/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 serde = { version = "1.0", features = ["derive"] }
 sha2 = "0.10.8"
-thiserror = "1"
+thiserror = { workspace = true }
 tinytemplate = "1.2"
 tracing = { workspace = true }
 
diff --git a/muxers/yamux/Cargo.toml b/muxers/yamux/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["network-programming", "asynchronous"]
 either = "1"
 futures = { workspace = true }
 libp2p-core = { workspace = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 yamux012 = { version = "0.12.1", package = "yamux" }
 yamux013 = { version = "0.13.3", package = "yamux" }
 tracing = { workspace = true }
diff --git a/protocols/autonat/Cargo.toml b/protocols/autonat/Cargo.toml
@@ -33,7 +33,7 @@ tracing = { workspace = true }
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 rand_core = { version = "0.6", optional = true }
-thiserror = { version = "1.0.52", optional = true }
+thiserror = { workspace = true, optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt", "sync"] }
diff --git a/protocols/dcutr/Cargo.toml b/protocols/dcutr/Cargo.toml
@@ -21,7 +21,7 @@ libp2p-swarm = { workspace = true }
 libp2p-identity = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 lru = "0.12.3"
 futures-bounded = { workspace = true }
diff --git a/protocols/floodsub/Cargo.toml b/protocols/floodsub/Cargo.toml
@@ -23,7 +23,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 # Passing arguments to the docsrs builder in order to properly document cfg's.
diff --git a/protocols/gossipsub/CHANGELOG.md b/protocols/gossipsub/CHANGELOG.md
@@ -1,25 +1,31 @@
 ## 0.48.0
 
+- Correct state inconsistencies with the mesh and fanout when unsubscribing.
+  See [PR 5690](https://github.com/libp2p/rust-libp2p/pull/5690)
+
 - Deprecate `futures-ticker` and use `futures-timer` instead.
   See [PR 5674](https://github.com/libp2p/rust-libp2p/pull/5674).
+
 - Apply `max_transmit_size` to the inner message instead of the final payload.
   See [PR 5642](https://github.com/libp2p/rust-libp2p/pull/5642).
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
 
-## 0.47.1
-
 - Attempt to publish to at least mesh_n peers when flood publish is disabled.
   See [PR 5578](https://github.com/libp2p/rust-libp2p/pull/5578).
 
 - Introduce back pressure and penalize slow peers. Drop stale messages that timeout before being
   delivered.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
+
 - Change `Behaviour::unsubscribe` and `Behaviour::report_message_validation_result`
   to `bool` they don't need to be a `Result`.
   See [PR 5595](https://github.com/libp2p/rust-libp2p/pull/5595).
 
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.47.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/protocols/gossipsub/src/backoff.rs b/protocols/gossipsub/src/backoff.rs
@@ -128,7 +128,7 @@ impl BackoffStorage {
     pub(crate) fn is_backoff_with_slack(&self, topic: &TopicHash, peer: &PeerId) -> bool {
         self.backoffs
             .get(topic)
-            .map_or(false, |m| m.contains_key(peer))
+            .is_some_and(|m| m.contains_key(peer))
     }
 
     pub(crate) fn get_backoff_time(&self, topic: &TopicHash, peer: &PeerId) -> Option<Instant> {
diff --git a/protocols/gossipsub/src/behaviour.rs b/protocols/gossipsub/src/behaviour.rs
@@ -1682,7 +1682,7 @@ where
         let self_published = !self.config.allow_self_origin()
             && if let Some(own_id) = self.publish_config.get_own_id() {
                 own_id != propagation_source
-                    && raw_message.source.as_ref().map_or(false, |s| s == own_id)
+                    && raw_message.source.as_ref().is_some_and(|s| s == own_id)
             } else {
                 self.published_message_ids.contains(msg_id)
             };
@@ -1955,8 +1955,11 @@ where
             }
         }
 
-        // remove unsubscribed peers from the mesh if it exists
+        // remove unsubscribed peers from the mesh and fanout if they exist there.
         for (peer_id, topic_hash) in unsubscribed_peers {
+            self.fanout
+                .get_mut(&topic_hash)
+                .map(|peers| peers.remove(&peer_id));
             self.remove_peer_from_mesh(&peer_id, &topic_hash, None, false, Churn::Unsub);
         }
 
diff --git a/protocols/identify/Cargo.toml b/protocols/identify/Cargo.toml
@@ -22,7 +22,7 @@ lru = "0.12.3"
 quick-protobuf-codec = { workspace = true }
 quick-protobuf = "0.8"
 smallvec = "1.13.2"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 either = "1.12.0"
 
diff --git a/protocols/kad/CHANGELOG.md b/protocols/kad/CHANGELOG.md
@@ -6,6 +6,8 @@
   See [PR 5573](https://github.com/libp2p/rust-libp2p/pull/5573).
 - Add `Behavior::find_closest_local_peers()`.
   See [PR 5645](https://github.com/libp2p/rust-libp2p/pull/5645).
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.46.2
 
diff --git a/protocols/kad/Cargo.toml b/protocols/kad/Cargo.toml
@@ -30,7 +30,7 @@ uint = "0.9"
 futures-timer = "3.0.3"
 web-time = { workspace = true }
 serde = { version = "1.0", optional = true, features = ["derive"] }
-thiserror = "1"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/kad/src/jobs.rs b/protocols/kad/src/jobs.rs
@@ -205,7 +205,7 @@ impl PutRecordJob {
         T: RecordStore,
     {
         if self.inner.check_ready(cx, now) {
-            let publish = self.next_publish.map_or(false, |t_pub| now >= t_pub);
+            let publish = self.next_publish.is_some_and(|t_pub| now >= t_pub);
             let records = store
                 .records()
                 .filter_map(|r| {
diff --git a/protocols/kad/src/kbucket.rs b/protocols/kad/src/kbucket.rs
@@ -527,12 +527,12 @@ where
 
     /// Returns true if the bucket has a pending node.
     pub fn has_pending(&self) -> bool {
-        self.bucket.pending().map_or(false, |n| !n.is_ready())
+        self.bucket.pending().is_some_and(|n| !n.is_ready())
     }
 
     /// Tests whether the given distance falls into this bucket.
     pub fn contains(&self, d: &Distance) -> bool {
-        BucketIndex::new(d).map_or(false, |i| i == self.index)
+        BucketIndex::new(d).is_some_and(|i| i == self.index)
     }
 
     /// Generates a random distance that falls into this bucket.
diff --git a/protocols/kad/src/kbucket/bucket.rs b/protocols/kad/src/kbucket/bucket.rs
@@ -376,7 +376,7 @@ where
             // Adjust `first_connected_pos` accordingly.
             match status {
                 NodeStatus::Connected => {
-                    if self.first_connected_pos.map_or(false, |p| p == pos.0)
+                    if self.first_connected_pos.is_some_and(|p| p == pos.0)
                         && pos.0 == self.nodes.len()
                     {
                         // It was the last connected node.
@@ -397,7 +397,7 @@ where
 
     /// Returns the status of the node at the given position.
     pub(crate) fn status(&self, pos: Position) -> NodeStatus {
-        if self.first_connected_pos.map_or(false, |i| pos.0 >= i) {
+        if self.first_connected_pos.is_some_and(|i| pos.0 >= i) {
             NodeStatus::Connected
         } else {
             NodeStatus::Disconnected
diff --git a/protocols/kad/src/record.rs b/protocols/kad/src/record.rs
@@ -104,7 +104,7 @@ impl Record {
 
     /// Checks whether the record is expired w.r.t. the given `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
@@ -157,7 +157,7 @@ impl ProviderRecord {
 
     /// Checks whether the provider record is expired w.r.t. the given `Instant`.
     pub fn is_expired(&self, now: Instant) -> bool {
-        self.expires.map_or(false, |t| now >= t)
+        self.expires.is_some_and(|t| now >= t)
     }
 }
 
diff --git a/protocols/perf/Cargo.toml b/protocols/perf/Cargo.toml
@@ -28,7 +28,7 @@ libp2p-tls = { workspace = true }
 libp2p-yamux = { workspace = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["env-filter"] }
 tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread"] }
diff --git a/protocols/relay/Cargo.toml b/protocols/relay/Cargo.toml
@@ -25,7 +25,7 @@ quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8.4"
 static_assertions = "1"
-thiserror = "1.0"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/protocols/rendezvous/Cargo.toml b/protocols/rendezvous/Cargo.toml
@@ -24,7 +24,7 @@ libp2p-request-response = { workspace = true }
 quick-protobuf = "0.8"
 quick-protobuf-codec = { workspace = true }
 rand = "0.8"
-thiserror = "1"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
diff --git a/swarm/CHANGELOG.md b/swarm/CHANGELOG.md
@@ -5,6 +5,9 @@
 
 - Deprecate `void` crate.
   See [PR 5676](https://github.com/libp2p/rust-libp2p/pull/5676).
+  
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
 
 ## 0.45.1
 
diff --git a/swarm/src/connection/pool.rs b/swarm/src/connection/pool.rs
@@ -208,7 +208,7 @@ struct PendingConnection {
 
 impl PendingConnection {
     fn is_for_same_remote_as(&self, other: PeerId) -> bool {
-        self.peer_id.map_or(false, |peer| peer == other)
+        self.peer_id == Some(other)
     }
 
     /// Aborts the connection attempt, closing the connection.
diff --git a/transports/noise/CHANGELOG.md b/transports/noise/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.45.1
+
+- Fix `cargo clippy` warnings in `rustc 1.84.0-beta.1`.
+  See [PR 5700](https://github.com/libp2p/rust-libp2p/pull/5700).
+
 ## 0.45.0
 
 <!-- Update to libp2p-swarm v0.45.0 -->
diff --git a/transports/noise/Cargo.toml b/transports/noise/Cargo.toml
@@ -3,7 +3,7 @@ name = "libp2p-noise"
 edition = "2021"
 rust-version = { workspace = true }
 description = "Cryptographic handshake protocol using the noise framework."
-version = "0.45.0"
+version = "0.45.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -22,7 +22,7 @@ quick-protobuf = "0.8"
 rand = "0.8.3"
 sha2 = "0.10.8"
 static_assertions = "1"
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tracing = { workspace = true }
 x25519-dalek = "2"
 zeroize = "1"
diff --git a/transports/noise/src/io/handshake.rs b/transports/noise/src/io/handshake.rs
@@ -108,7 +108,7 @@ where
             .id_remote_pubkey
             .ok_or_else(|| Error::AuthenticationFailed)?;
 
-        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().map_or(false, |s| {
+        let is_valid_signature = self.dh_remote_pubkey_sig.as_ref().is_some_and(|s| {
             id_pk.verify(&[STATIC_KEY_DOMAIN.as_bytes(), pubkey.as_ref()].concat(), s)
         });
 
diff --git a/transports/quic/Cargo.toml b/transports/quic/Cargo.toml
@@ -21,7 +21,7 @@ parking_lot = "0.12.3"
 quinn = { version = "0.11.2", default-features = false, features = ["rustls", "futures-io"] }
 rand = "0.8.5"
 rustls = { version = "0.23.9", default-features = false }
-thiserror = "1.0.61"
+thiserror = { workspace = true }
 tokio = { workspace = true, default-features = false, features = ["net", "rt", "time"], optional = true }
 tracing = { workspace = true }
 socket2 = "0.5.7"
diff --git a/transports/tls/Cargo.toml b/transports/tls/Cargo.toml
diff --git a/transports/webrtc-websys/Cargo.toml b/transports/webrtc-websys/Cargo.toml
diff --git a/transports/webrtc/Cargo.toml b/transports/webrtc/Cargo.toml
diff --git a/transports/websocket-websys/CHANGELOG.md b/transports/websocket-websys/CHANGELOG.md
diff --git a/transports/websocket-websys/Cargo.toml b/transports/websocket-websys/Cargo.toml
diff --git a/transports/websocket-websys/src/lib.rs b/transports/websocket-websys/src/lib.rs
diff --git a/transports/websocket/Cargo.toml b/transports/websocket/Cargo.toml
diff --git a/transports/webtransport-websys/CHANGELOG.md b/transports/webtransport-websys/CHANGELOG.md
diff --git a/transports/webtransport-websys/Cargo.toml b/transports/webtransport-websys/Cargo.toml
diff --git a/transports/webtransport-websys/src/lib.rs b/transports/webtransport-websys/src/lib.rs
diff --git a/wasm-tests/webtransport-tests/src/lib.rs b/wasm-tests/webtransport-tests/src/lib.rs
