add add_and_connect

add tests

crates/net/network/src/manager.rs

@@ -589,7 +589,7 @@ impl NetworkManager {
                 self.swarm.sessions_mut().disconnect(peer_id, reason);
             }
             NetworkHandleMessage::ConnectPeer(peer_id, kind, addr) => {
-                self.swarm.state_mut().connect_peer_kind(peer_id, kind, addr);
+                self.swarm.state_mut().add_and_connect(peer_id, kind, addr);
             }
             NetworkHandleMessage::SetNetworkState(net_state) => {
                 // Sets network connection state between Active and Hibernate.

crates/net/network/src/peers.rs

@@ -732,17 +732,17 @@ impl PeersManager {
     /// Connect to the given peer. NOTE: if the maximum number out outbound sessions is reached,
     /// this won't do anything. See `reth_network::SessionManager::dial_outbound`.
     #[allow(dead_code)]
-    pub(crate) fn connect_peer(
+    pub(crate) fn add_and_connect(
         &mut self,
         peer_id: PeerId,
         addr: PeerAddr,
         fork_id: Option<ForkId>,
     ) {
-        self.connect_peer_kind(peer_id, PeerKind::Basic, addr, fork_id)
+        self.add_and_connect_kind(peer_id, PeerKind::Basic, addr, fork_id)
     }
 
     ///  Connects a peer and its address with the given kind.
-    pub(crate) fn connect_peer_kind(
+    pub(crate) fn add_and_connect_kind(
         &mut self,
         peer_id: PeerId,
         kind: PeerKind,
@@ -2428,7 +2428,7 @@ mod tests {
         let peer = PeerId::random();
         let socket_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 1, 2)), 8008);
         let mut peers = PeersManager::default();
-        peers.connect_peer(peer, PeerAddr::from_tcp(socket_addr), None);
+        peers.add_and_connect(peer, PeerAddr::from_tcp(socket_addr), None);
 
         match event!(peers) {
             PeerAction::Connect { peer_id, remote_addr } => {
@@ -2443,7 +2443,7 @@ mod tests {
         assert_eq!(record.udp_addr(), socket_addr);
 
         // connect again
-        peers.connect_peer(peer, PeerAddr::from_tcp(socket_addr), None);
+        peers.add_and_connect(peer, PeerAddr::from_tcp(socket_addr), None);
 
         let (record, _) = peers.peer_by_id(peer).unwrap();
         assert_eq!(record.tcp_addr(), socket_addr);

crates/net/network/src/state.rs

@@ -297,8 +297,8 @@ impl NetworkState {
     }
 
     /// Connects a peer and its address with the given kind
-    pub(crate) fn connect_peer_kind(&mut self, peer_id: PeerId, kind: PeerKind, addr: PeerAddr) {
-        self.peers_manager.connect_peer_kind(peer_id, kind, addr, None)
+    pub(crate) fn add_and_connect(&mut self, peer_id: PeerId, kind: PeerKind, addr: PeerAddr) {
+        self.peers_manager.add_and_connect_kind(peer_id, kind, addr, None)
     }
 
     /// Removes a peer and its address with the given kind from the peerset.