address review

Author: skaunov

protocols/autonat/src/v2.rs

@@ -2,7 +2,7 @@
 //!
 //! The implementation follows the [libp2p spec](https://github.com/libp2p/specs/blob/03718ef0f2dea4a756a85ba716ee33f97e4a6d6c/autonat/autonat-v2.md).
 //!
-//! The new version fixes the issues of the first version:
+//! The new version fixes the issues of the first version.
 //! - The server now always dials back over a newly allocated port. This greatly reduces the risk of
 //!   false positives that often occurred in the first version, when the client-server connection
 //!   occurred over a hole-punched port.

protocols/dcutr/src/behaviour.rs

@@ -325,10 +325,10 @@ impl NetworkBehaviour for Behaviour {
     #[tracing::instrument(level = "trace", name = "NetworkBehaviour::poll", skip(self))]
     fn poll(&mut self, _: &mut Context<'_>) -> Poll<ToSwarm<Self::ToSwarm, THandlerInEvent<Self>>> {
         if let Some(event) = self.queued_events.pop_front() {
-            return Poll::Ready(event);
+            Poll::Ready(event)
+        } else {
+            Poll::Pending
         }
-
-        Poll::Pending
     }
 
     fn on_swarm_event(&mut self, event: FromSwarm) {

protocols/kad/src/behaviour.rs

@@ -870,9 +870,10 @@ where
         mut record: Record,
         quorum: Quorum,
     ) -> Result<QueryId, store::Error> {
-        if record.publisher.is_some() {
-            record.publisher = Some(*self.kbuckets.local_key().preimage())
-        }
+        record
+            .publisher
+            .and(Some(*self.kbuckets.local_key().preimage()));
+
         self.store.put(record.clone())?;
         record.expires = record
             .expires

protocols/kad/src/behaviour/test.rs

@@ -557,16 +557,12 @@ fn get_record_not_found() {
     }))
 }
 
-/// A node joining a fully connected network via three (ALPHA_VALUE) bootnodes
+/// A node joining a fully connected network via three (`ALPHA_VALUE`) bootnodes
 /// should be able to put a record to the X closest nodes of the network where X
 /// is equal to the configured replication factor.
 #[test]
 fn put_record() {
-    fn prop(mut records: Vec<Record>, seed: Seed, filter_records: bool, drop_records: bool) {
-        tracing::trace!("remove records without a publisher");
-        // this test relies on counting republished `Record` against `records.len()`
-        records.retain(|r| r.publisher.is_some());
-
+    fn prop(records: Vec<Record>, seed: Seed, filter_records: bool, drop_records: bool) {
         let mut rng = StdRng::from_seed(seed.0);
         let replication_factor =
             NonZeroUsize::new(rng.gen_range(1..(K_VALUE.get() / 2) + 1)).unwrap();
@@ -613,6 +609,8 @@ fn put_record() {
         #[allow(clippy::mutable_key_type)] // False positive, we never modify `Bytes`.
         let records = records
             .into_iter()
+            // Exclude records without a publisher.
+            .filter(|r| r.publisher.is_some())
             .take(num_total)
             .map(|mut r| {
                 // We don't want records to expire prematurely, as they would

swarm/src/behaviour.rs

@@ -449,8 +449,7 @@ pub enum FromSwarm<'a> {
     /// Informs the behaviour that the [`ConnectedPoint`] of an existing
     /// connection has changed.
     AddressChange(AddressChange<'a>),
-    /// Informs the behaviour that the dial to a known
-    /// or unknown node failed.
+    /// Informs the behaviour that the dial to a known or unknown node failed.
     DialFailure(DialFailure<'a>),
     /// Informs the behaviour that an error
     /// happened on an incoming connection during its initial handshake.