fix: code review - rework

Author: CHr15F0x

bitswap/src/protocol.rs

@@ -8,7 +8,10 @@ use crate::ledger::Message;
 use core::future::Future;
 use core::iter;
 use core::pin::Pin;
-use futures::io::{AsyncRead, AsyncWrite};
+use futures::{
+    io::{AsyncRead, AsyncWrite},
+    AsyncWriteExt,
+};
 use libp2p_core::{upgrade, InboundUpgrade, OutboundUpgrade, UpgradeInfo};
 use std::io;
 
@@ -71,7 +74,8 @@ where
     fn upgrade_outbound(self, mut socket: TSocket, _info: Self::Info) -> Self::Future {
         Box::pin(async move {
             let bytes = self.to_bytes();
-            upgrade::write_length_prefixed(&mut socket, bytes).await
+            upgrade::write_length_prefixed(&mut socket, bytes).await?;
+            socket.close().await
         })
     }
 }

src/lib.rs

@@ -1369,7 +1369,7 @@ impl<TRepoTypes: RepoTypes> Future for IpfsFuture<TRepoTypes> {
             loop {
                 let inner = {
                     use futures::StreamExt;
-                    let next = self.swarm.next();
+                    let next = self.swarm.select_next_some();
                     futures::pin_mut!(next);
                     match next.poll(ctx) {
                         Poll::Ready(inner) => inner,
@@ -1382,7 +1382,7 @@ impl<TRepoTypes: RepoTypes> Future for IpfsFuture<TRepoTypes> {
                 // off the events from Ipfs and ... this looping goes on for a while.
                 done = false;
                 match inner {
-                    Some(SwarmEvent::NewListenAddr { address, .. }) => {
+                    SwarmEvent::NewListenAddr { address, .. } => {
                         self.complete_listening_address_adding(address);
                     }
                     _ => trace!("{:?}", inner),

src/p2p/addr.rs

@@ -217,26 +217,10 @@ pub(crate) fn could_be_bound_from_ephemeral(
 
 // Checks if two instances of multiaddr are equal comparing as many protocol segments as possible
 pub(crate) fn eq_greedy(addr0: &Multiaddr, addr1: &Multiaddr) -> bool {
-    match (addr0.is_empty(), addr1.is_empty()) {
-        (true, true) => true,
-        (false, false) => {
-            let mut it1 = addr1.iter();
-
-            for i0 in addr0.iter() {
-                if let Some(i1) = it1.next() {
-                    if i0 != i1 {
-                        return false;
-                    }
-                } else {
-                    // All previous segments were equal
-                    return true;
-                }
-            }
-
-            true
-        }
-        _ => false,
+    if addr0.is_empty() != addr1.is_empty() {
+        return false;
     }
+    addr0.iter().zip(addr1.iter()).all(|(a, b)| a == b)
 }
 
 #[cfg(test)]