wip: establish connection

crates/core/src/message.rs

@@ -303,6 +303,7 @@ pub(crate) enum NodeEvent {
     // Try connecting to the given peer.
     ConnectPeer {
         peer: PeerId,
+        tx: Transaction,
         callback: tokio::sync::mpsc::Sender<Result<(), ()>>,
     },
     Disconnect {

crates/core/src/node.rs

@@ -147,7 +147,7 @@ impl NodeConfig {
             config.network_api.port
         );
         if let Some(peer_id) = &config.peer_id {
-            tracing::info!("Node external address: {}", peer_id.addr());
+            tracing::info!("Node external address: {}", peer_id.addr);
         }
         Ok(NodeConfig {
             should_connect: true,
@@ -911,10 +911,13 @@ where
     Ok(())
 }
 
-/*
-- Cuando es un gateway: se define desde el inicio del nodo
-- Cuando es un peer regular: se define en el momento de la conexión con el gateway
-*/
+/// The identifier of a peer in the network is composed of its address and public key.
+///
+/// A regular peer will have its `PeerId` set when it connects to a gateway as it get's
+/// its external address from the gateway.
+///
+/// A gateway will have its `PeerId` set when it is created since it will know its own address
+/// from the start.
 #[derive(Serialize, Deserialize, PartialEq, Eq, Hash, Clone)]
 pub struct PeerId {
     pub addr: SocketAddr,
@@ -933,28 +936,10 @@ impl PartialOrd for PeerId {
     }
 }
 
-// impl FromStr for PeerId {
-//     type Err = anyhow::Error;
-//     fn from_str(s: &str) -> Result<Self, Self::Err> {
-//         Ok(Self {
-//             addr: s.parse()?,
-//             pub_key: TransportKeypair::new().public,
-//         })
-//     }
-// }
-
 impl PeerId {
     pub fn new(addr: SocketAddr, pub_key: TransportPublicKey) -> Self {
         Self { addr, pub_key }
     }
-
-    pub fn addr(&self) -> SocketAddr {
-        self.addr
-    }
-
-    pub fn pub_key(&self) -> &TransportPublicKey {
-        &self.pub_key
-    }
 }
 
 thread_local! {

crates/core/src/node/network_bridge/handshake.rs

@@ -41,7 +41,7 @@ pub(super) enum HandshakeError {
     TransportError(#[from] TransportError),
 }
 
-#[cfg_attr(test, derive(Debug))]
+#[derive(Debug)]
 pub(super) enum Event {
     /// An inbound connection to a peer was successfully established at a gateway.
     InboundConnection(InboundJoinRequest),
@@ -515,7 +515,7 @@ async fn wait_for_gw_confirmation(
     todo!()
 }
 
-#[cfg_attr(test, derive(Debug))]
+#[derive(Debug)]
 pub(super) struct InboundJoinRequest {
     pub conn: PeerConnection,
     pub id: Transaction,
@@ -991,7 +991,7 @@ mod tests {
                     assert!(matches!(connection, ConnectOp { .. }));
                     Ok(())
                 }
-                other => Ok(()),
+                other => Err(anyhow!("Unexpected event: {:?}", other)),
             }
         };