Merge pull request #58 from rustaceanrob/clean-peer

node: rm fields
rustaceanrob · Aug 5, 2024 · 221cc2d · 221cc2d
2 parents 1add428 + a3fe415
commit 221cc2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/node/peer_map.rs b/src/node/peer_map.rs
@@ -146,8 +146,6 @@ impl PeerMap {
         self.num_peers = peer_num;
         let mut peer = Peer::new(
             peer_num,
-            ip.clone(),
-            port,
             self.network,
             self.mtx.clone(),
             prx,
@@ -157,11 +155,11 @@ impl PeerMap {
         if !connector.can_connect(&ip) {
             return Err(PeerError::UnreachableSocketAddr);
         }
-        let (reader, writer) = connector.connect(ip.clone(), port).await?;
-        let handle = tokio::spawn(async move { peer.run(reader, writer).await });
         self.dialog
             .send_dialog(format!("Connecting to {:?}:{}", ip, port))
             .await;
+        let (reader, writer) = connector.connect(ip.clone(), port).await?;
+        let handle = tokio::spawn(async move { peer.run(reader, writer).await });
         self.map.insert(
             peer_num,
             ManagedPeer {

diff --git a/src/peers/peer.rs b/src/peers/peer.rs
@@ -1,7 +1,7 @@
 extern crate tokio;
 use std::time::Duration;
 
-use bitcoin::{p2p::address::AddrV2, Network};
+use bitcoin::Network;
 use tokio::{
     io::{AsyncRead, AsyncWrite, AsyncWriteExt},
     select,
@@ -28,8 +28,6 @@ const CONNECTION_TIMEOUT: u64 = 2;
 
 pub(crate) struct Peer {
     nonce: u32,
-    ip_addr: AddrV2,
-    port: u16,
     main_thread_sender: Sender<PeerThreadMessage>,
     main_thread_recv: Receiver<MainThreadMessage>,
     network: Network,
@@ -41,8 +39,6 @@ pub(crate) struct Peer {
 impl Peer {
     pub fn new(
         nonce: u32,
-        ip_addr: AddrV2,
-        port: u16,
         network: Network,
         main_thread_sender: Sender<PeerThreadMessage>,
         main_thread_recv: Receiver<MainThreadMessage>,
@@ -52,8 +48,6 @@ impl Peer {
         let message_timer = MessageTimer::new();
         Self {
             nonce,
-            ip_addr,
-            port,
             main_thread_sender,
             main_thread_recv,
             network,