Remove simple MessageGenerator methods

Use `serialize` to remove some of the code bloat in `outbound_messages`.

Author: rustaceanrob

src/network/mod.rs

@@ -389,7 +389,7 @@ impl TimeSensitiveId {
 #[derive(Debug, Clone)]
 pub(crate) enum MainThreadMessage {
     GetAddr,
-    GetAddrV2,
+    SendAddrV2,
     WtxidRelay,
     #[allow(unused)]
     SendHeaders,

src/network/outbound_messages.rs

@@ -50,31 +50,6 @@ impl MessageGenerator {
         self.serialize(msg)
     }
 
-    pub(in crate::network) fn verack(&mut self) -> Vec<u8> {
-        let msg = NetworkMessage::Verack;
-        self.serialize(msg)
-    }
-
-    pub(in crate::network) fn addr(&mut self) -> Vec<u8> {
-        let msg = NetworkMessage::GetAddr;
-        self.serialize(msg)
-    }
-
-    pub(in crate::network) fn addrv2(&mut self) -> Vec<u8> {
-        let msg = NetworkMessage::SendAddrV2;
-        self.serialize(msg)
-    }
-
-    pub(in crate::network) fn wtxid_relay(&mut self) -> Vec<u8> {
-        let msg = NetworkMessage::WtxidRelay;
-        self.serialize(msg)
-    }
-
-    pub(in crate::network) fn sendheaders(&mut self) -> Vec<u8> {
-        let msg = NetworkMessage::SendHeaders;
-        self.serialize(msg)
-    }
-
     pub(in crate::network) fn headers(&mut self, msg: GetHeadersMessage) -> Vec<u8> {
         let msg = NetworkMessage::GetHeaders(msg);
         self.serialize(msg)

src/network/peer.rs

@@ -3,7 +3,10 @@ use std::{sync::Arc, time::Duration};
 
 use addrman::Record;
 use bip324::{AsyncProtocol, PacketReader, PacketWriter, Role};
-use bitcoin::{p2p::ServiceFlags, Network};
+use bitcoin::{
+    p2p::{message::NetworkMessage, ServiceFlags},
+    Network,
+};
 use tokio::{
     io::{AsyncRead, AsyncWrite, AsyncWriteExt, BufReader},
     net::TcpStream,
@@ -333,19 +336,19 @@ impl Peer {
         }
         match request {
             MainThreadMessage::GetAddr => {
-                let message = message_generator.addr();
+                let message = message_generator.serialize(NetworkMessage::GetAddr);
                 self.write_bytes(writer, message).await?;
             }
-            MainThreadMessage::GetAddrV2 => {
-                let message = message_generator.addrv2();
+            MainThreadMessage::SendAddrV2 => {
+                let message = message_generator.serialize(NetworkMessage::SendAddrV2);
                 self.write_bytes(writer, message).await?;
             }
             MainThreadMessage::WtxidRelay => {
-                let message = message_generator.wtxid_relay();
+                let message = message_generator.serialize(NetworkMessage::WtxidRelay);
                 self.write_bytes(writer, message).await?;
             }
             MainThreadMessage::SendHeaders => {
-                let message = message_generator.sendheaders();
+                let message = message_generator.serialize(NetworkMessage::SendHeaders);
                 self.write_bytes(writer, message).await?;
             }
             MainThreadMessage::GetHeaders(config) => {
@@ -382,7 +385,7 @@ impl Peer {
                 }
             }
             MainThreadMessage::Verack => {
-                let message = message_generator.verack();
+                let message = message_generator.serialize(NetworkMessage::Verack);
                 self.write_bytes(writer, message).await?;
                 self.message_state.verack.sent_ack();
                 if self.message_state.verack.both_acks() {

src/node.rs

@@ -401,7 +401,7 @@ impl Node {
         self.peer_map.tried(nonce).await;
         // First we signal for ADDRV2 support
         self.peer_map
-            .send_message(nonce, MainThreadMessage::GetAddrV2)
+            .send_message(nonce, MainThreadMessage::SendAddrV2)
             .await;
         // Then for BIP 339 witness transaction broadcast
         self.peer_map