Skip to content

Remove more wrapper methods from MessageGenerator #524

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustaceanrob merged 1 commit into from
Nov 22, 2025
Merged

Remove more wrapper methods from MessageGenerator #524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 1 addition & 27 deletions src/network/outbound.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ use bitcoin::{
consensus::serialize,
p2p::{
message::{NetworkMessage, RawNetworkMessage},
message_blockdata::{GetHeadersMessage, Inventory},
message_filter::{GetCFHeaders, GetCFilters},
message_blockdata::Inventory,
message_network::VersionMessage,
Address, ServiceFlags,
},
Expand Down Expand Up @@ -50,37 +49,12 @@ impl MessageGenerator {
self.serialize(msg)
}

pub(in crate::network) fn headers(&mut self, msg: GetHeadersMessage) -> Vec<u8> {
let msg = NetworkMessage::GetHeaders(msg);
self.serialize(msg)
}

pub(in crate::network) fn cf_headers(&mut self, message: GetCFHeaders) -> Vec<u8> {
let msg = NetworkMessage::GetCFHeaders(message);
self.serialize(msg)
}

pub(in crate::network) fn filters(&mut self, message: GetCFilters) -> Vec<u8> {
let msg = NetworkMessage::GetCFilters(message);
self.serialize(msg)
}

pub(in crate::network) fn block(&mut self, hash: BlockHash) -> Vec<u8> {
let inv = Inventory::Block(hash);
let msg = NetworkMessage::GetData(vec![inv]);
self.serialize(msg)
}

pub(in crate::network) fn ping(&mut self, nonce: u64) -> Vec<u8> {
let msg = NetworkMessage::Ping(nonce);
self.serialize(msg)
}

pub(in crate::network) fn pong(&mut self, nonce: u64) -> Vec<u8> {
let msg = NetworkMessage::Pong(nonce);
self.serialize(msg)
}

pub(in crate::network) fn announce_transactions(&mut self, wtxids: Vec<Wtxid>) -> Vec<u8> {
let msg = NetworkMessage::Inv(wtxids.into_iter().map(Inventory::WTx).collect());
self.serialize(msg)
Expand Down
10 changes: 5 additions & 5 deletions src/network/peer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl Peer {
return Ok(());
}
if let Some(nonce) = self.message_state.ping_state.send_ping() {
let msg = outbound_messages.ping(nonce);
let msg = outbound_messages.serialize(NetworkMessage::Ping(nonce));
self.write_bytes(&mut writer, msg).await?;
let msg_id = TimeSensitiveId::PING;
self.message_state
Expand Down Expand Up @@ -288,7 +288,7 @@ impl Peer {
Ok(())
}
ReaderMessage::Ping(nonce) => {
let message = message_generator.pong(nonce);
let message = message_generator.serialize(NetworkMessage::Pong(nonce));
self.write_bytes(writer, message).await?;
Ok(())
}
Expand Down Expand Up @@ -352,18 +352,18 @@ impl Peer {
self.write_bytes(writer, message).await?;
}
MainThreadMessage::GetHeaders(config) => {
let message = message_generator.headers(config);
let message = message_generator.serialize(NetworkMessage::GetHeaders(config));
self.write_bytes(writer, message).await?;
}
MainThreadMessage::GetFilterHeaders(config) => {
let message = message_generator.cf_headers(config);
let message = message_generator.serialize(NetworkMessage::GetCFHeaders(config));
self.write_bytes(writer, message).await?;
}
MainThreadMessage::GetFilters(config) => {
self.message_state
.filter_rate
.batch_requested(config.stop_hash);
let message = message_generator.filters(config);
let message = message_generator.serialize(NetworkMessage::GetCFilters(config));
self.write_bytes(writer, message).await?;
}
MainThreadMessage::GetBlock(message) => {
Expand Down