From e15d3e6fd20b3f87abaad7ddec1c88b0e66419f9 Mon Sep 17 00:00:00 2001 From: hozan23 Date: Mon, 15 Jul 2024 13:16:01 +0200 Subject: p2p: Major refactoring of the handshake protocol Introduce a new protocol InitProtocol which can be used as the core protocol for initializing a connection with a peer. Move the handshake logic from the PeerPool module to the protocols directory and build a handshake protocol that implements InitProtocol trait. --- p2p/src/message.rs | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'p2p/src/message.rs') diff --git a/p2p/src/message.rs b/p2p/src/message.rs index 6498ef7..5bf0853 100644 --- a/p2p/src/message.rs +++ b/p2p/src/message.rs @@ -110,7 +110,9 @@ pub struct PeerMsg { /// PeersMsg a list of `PeerMsg`. #[derive(Decode, Encode, Debug)] -pub struct PeersMsg(pub Vec); +pub struct PeersMsg { + pub peers: Vec, +} impl From for PeerMsg { fn from(entry: Entry) -> PeerMsg { @@ -133,19 +135,3 @@ impl From for Entry { } } } - -macro_rules! get_msg_payload { - ($a:ident, $b:ident) => { - if let NetMsgCmd::$a = $b.header.command { - $b.payload - } else { - return Err(Error::InvalidMsg(format!( - "Expected {:?} msg found {:?} msg", - stringify!($a), - $b.header.command - ))); - } - }; -} - -pub(super) use get_msg_payload; -- cgit v1.2.3