update libipld and multihash, fix compat_test

Author: rkuhn

Cargo.lock

@@ -18,7 +18,7 @@ async-trait = "0.1.52"
 fnv = "1.0.7"
 futures = "0.3.19"
 lazy_static = "1.4.0"
-libipld = { version = "0.14.0", default-features = false }
+libipld = { version = "0.15.0", default-features = false }
 libp2p = { version = "0.50.0", features = ["request-response"] }
 prometheus = "0.13.0"
 prost = { version = "0.11", optional = true }
@@ -29,7 +29,7 @@ unsigned-varint = { version = "0.7.1", features = ["futures", "std"] }
 [dev-dependencies]
 async-std = { version = "1.10.0", features = ["attributes"] }
 env_logger = "0.9.0"
-libipld = { version = "0.14.0", default-features = false, features = ["dag-cbor"] }
+libipld = { version = "0.15.0", default-features = false, features = ["dag-cbor"] }
 libp2p = { version = "0.50.0", features = ["tcp", "noise", "yamux", "rsa", "async-std"] }
-multihash = { version = "0.16.1", default-features = false, features = ["blake3"] }
-tracing-subscriber = { version = "0.3.5", features = ["env-filter"] }
+multihash = { version = "0.17.0", default-features = false, features = ["blake3", "sha2"] }
+tracing-subscriber = { version = "0.3.5", features = ["env-filter", "tracing-log"] }

Cargo.toml

@@ -471,6 +471,7 @@ impl<P: StoreParams> NetworkBehaviour for Bitswap<P> {
         conn: ConnectionId,
         event: <Self::ConnectionHandler as ConnectionHandler>::OutEvent,
     ) {
+        tracing::trace!(?event, "on_connection_handler_event");
         #[cfg(not(feature = "compat"))]
         return self.inner.on_connection_handler_event(peer_id, conn, event);
         #[cfg(feature = "compat")]
@@ -945,10 +946,10 @@ mod tests {
         let cid: Cid = "QmP8njGuyiw9cjkhwHD9nZhyBTHufXFanAvZgcy9xYoWiB"
             .parse()
             .unwrap();
-        let peer_id: PeerId = "QmaCpDMGvV2BGHeYERUEnRQAwe3N8SzbUtfsmvsqQLuvuJ"
+        let peer_id: PeerId = "12D3KooWC1EaEEpghwnPdd89LaPTKEweD1PRLz4aRBkJEA9UiUuS"
             .parse()
             .unwrap();
-        let multiaddr: Multiaddr = "/ip4/104.131.131.82/tcp/4001".parse().unwrap();
+        let multiaddr: Multiaddr = "/ip4/95.217.194.97/tcp/8008".parse().unwrap();
 
         let mut peer = Peer::new();
         peer.swarm()

src/behaviour.rs

@@ -29,11 +29,20 @@ where
 
     fn upgrade_inbound(self, mut socket: TSocket, _info: Self::Info) -> Self::Future {
         Box::pin(async move {
+            tracing::trace!("upgrading inbound");
             let packet = upgrade::read_length_prefixed(&mut socket, MAX_BUF_SIZE)
                 .await
-                .map_err(other)?;
+                .map_err(|err| {
+                    tracing::debug!(%err, "inbound upgrade error");
+                    other(err)
+                })?;
             socket.close().await?;
-            let message = CompatMessage::from_bytes(&packet)?;
+            tracing::trace!("inbound upgrade done, closing");
+            let message = CompatMessage::from_bytes(&packet).map_err(|e| {
+                tracing::debug!(%e, "inbound upgrade error");
+                e
+            })?;
+            tracing::trace!("inbound upgrade closed");
             Ok(InboundMessage(message))
         })
     }