feat: leverage type-safe /p2p in multiaddr

This updates `multiaddr` to version `0.19`. Depends-On: libp2p#3656. Depends-On: multiformats/rust-multiaddr#83. Resolves: libp2p#4039. Pull-Request: libp2p#4037.
umgefahren · Jun 8, 2023 · 805da8b · 805da8b
1 parent 29b5c7d
commit 805da8b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/behaviour/as_server.rs b/src/behaviour/as_server.rs
@@ -338,15 +338,15 @@ impl<'a> AsServer<'a> {
 
                 let is_valid = addr.iter().all(|proto| match proto {
                     Protocol::P2pCircuit => false,
-                    Protocol::P2p(hash) => hash == peer.into(),
+                    Protocol::P2p(peer_id) => peer_id == peer,
                     _ => true,
                 });
 
                 if !is_valid {
                     return None;
                 }
                 if !addr.iter().any(|p| matches!(p, Protocol::P2p(_))) {
-                    addr.push(Protocol::P2p(peer.into()))
+                    addr.push(Protocol::P2p(peer))
                 }
                 // Only collect distinct addresses.
                 distinct.insert(addr.clone()).then_some(addr)
@@ -380,26 +380,26 @@ mod test {
         let observed_addr = Multiaddr::empty()
             .with(observed_ip.clone())
             .with(random_port())
-            .with(Protocol::P2p(peer_id.into()));
+            .with(Protocol::P2p(peer_id));
         // Valid address with matching peer-id
         let demanded_1 = Multiaddr::empty()
             .with(random_ip())
             .with(random_port())
-            .with(Protocol::P2p(peer_id.into()));
+            .with(Protocol::P2p(peer_id));
         // Invalid because peer_id does not match
         let demanded_2 = Multiaddr::empty()
             .with(random_ip())
             .with(random_port())
-            .with(Protocol::P2p(PeerId::random().into()));
+            .with(Protocol::P2p(PeerId::random()));
         // Valid address without peer-id
         let demanded_3 = Multiaddr::empty().with(random_ip()).with(random_port());
         // Invalid because relayed
         let demanded_4 = Multiaddr::empty()
             .with(random_ip())
             .with(random_port())
-            .with(Protocol::P2p(PeerId::random().into()))
+            .with(Protocol::P2p(PeerId::random()))
             .with(Protocol::P2pCircuit)
-            .with(Protocol::P2p(peer_id.into()));
+            .with(Protocol::P2p(peer_id));
         let demanded = vec![
             demanded_1.clone(),
             demanded_2,
@@ -413,7 +413,7 @@ mod test {
         let expected_2 = demanded_3
             .replace(0, |_| Some(observed_ip))
             .unwrap()
-            .with(Protocol::P2p(peer_id.into()));
+            .with(Protocol::P2p(peer_id));
         assert_eq!(filtered, vec![expected_1, expected_2]);
     }
 }
diff --git a/tests/test_server.rs b/tests/test_server.rs
@@ -69,7 +69,7 @@ async fn test_dial_back() {
     let expect_addr = Multiaddr::empty()
         .with(Protocol::Ip4(observed_client_ip))
         .with(Protocol::Tcp(client_port))
-        .with(Protocol::P2p(client_id.into()));
+        .with(Protocol::P2p(client_id));
     let request_probe_id = match server.next_behaviour_event().await {
         Event::InboundProbe(InboundProbeEvent::Request {
             peer,