protocols/identify: Update to latest changes

libp2p · Nov 8, 2021 · eea9e12 · eea9e12
1 parent ad083e9
commit eea9e12
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/protocols/identify/src/identify.rs b/protocols/identify/src/identify.rs
@@ -27,8 +27,9 @@ use libp2p_core::{
     ConnectedPoint, Multiaddr, PeerId, PublicKey,
 };
 use libp2p_swarm::{
-    AddressScore, DialError, DialPeerCondition, IntoProtocolsHandler, NegotiatedSubstream,
-    NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, PollParameters, ProtocolsHandler,
+    dial_opts::{self, DialOpts},
+    AddressScore, DialError, IntoProtocolsHandler, NegotiatedSubstream, NetworkBehaviour,
+    NetworkBehaviourAction, NotifyHandler, PollParameters, ProtocolsHandler,
     ProtocolsHandlerUpgrErr,
 };
 use lru::LruCache;
@@ -198,9 +199,10 @@ impl Identify {
             if self.pending_push.insert(p) {
                 if !self.connected.contains_key(&p) {
                     let handler = self.new_handler();
-                    self.events.push_back(NetworkBehaviourAction::DialPeer {
-                        peer_id: p,
-                        condition: DialPeerCondition::Disconnected,
+                    self.events.push_back(NetworkBehaviourAction::Dial {
+                        opts: DialOpts::peer_id(p)
+                            .condition(dial_opts::PeerCondition::Disconnected)
+                            .build(),
                         handler,
                     });
                 }
@@ -561,7 +563,9 @@ mod tests {
                 }
             }
         });
-        swarm2.dial_addr(listen_addr).unwrap();
+        swarm2
+            .dial(DialOpts::unknown_peer_id().address(listen_addr).build())
+            .unwrap();
 
         // nb. Either swarm may receive the `Identified` event first, upon which
         // it will permit the connection to be closed, as defined by
@@ -641,7 +645,9 @@ mod tests {
             }
         });
 
-        Swarm::dial_addr(&mut swarm2, listen_addr).unwrap();
+        swarm2
+            .dial(DialOpts::unknown_peer_id().address(listen_addr).build())
+            .unwrap();
 
         async_std::task::block_on(async move {
             loop {
@@ -728,7 +734,9 @@ mod tests {
             }
         });
 
-        swarm2.dial_addr(listen_addr).unwrap();
+        swarm2
+            .dial(DialOpts::unknown_peer_id().address(listen_addr).build())
+            .unwrap();
 
         // wait until we identified
         async_std::task::block_on(async {
@@ -744,7 +752,9 @@ mod tests {
         swarm2.disconnect_peer_id(swarm1_peer_id).unwrap();
 
         // we should still be able to dial now!
-        swarm2.dial(&swarm1_peer_id).unwrap();
+        swarm2
+            .dial(DialOpts::peer_id(swarm1_peer_id).build())
+            .unwrap();
 
         let connected_peer = async_std::task::block_on(async {
             loop {