Skip to content

Commit

Permalink
Drop serialization for OnionMessage{Intercepted,PeerConnected}
Browse files Browse the repository at this point in the history
.. event variants, as we never serialize them anyways.
  • Loading branch information
tnull committed Jul 8, 2024
1 parent 61bde0c commit 985056c
Showing 1 changed file with 8 additions and 32 deletions.
40 changes: 8 additions & 32 deletions lightning/src/events/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1609,18 +1609,13 @@ impl Writeable for Event {
35u8.write(writer)?;
// Never write ConnectionNeeded events as buffered onion messages aren't serialized.
},
&Event::OnionMessageIntercepted { ref peer_node_id, ref message } => {
&Event::OnionMessageIntercepted { .. } => {
37u8.write(writer)?;
write_tlv_fields!(writer, {
(0, peer_node_id, required),
(2, message, required),
});
// Never write OnionMessageIntercepted events as buffered onion messages aren't serialized.
},
&Event::OnionMessagePeerConnected { ref peer_node_id } => {
&Event::OnionMessagePeerConnected { .. } => {
39u8.write(writer)?;
write_tlv_fields!(writer, {
(0, peer_node_id, required),
});
// Never write OnionMessage events as buffered onion messages aren't serialized.
},
&Event::InvoiceReceived { ref payment_id, ref invoice, ref responder } => {
41u8.write(writer)?;
Expand Down Expand Up @@ -2043,29 +2038,10 @@ impl MaybeReadable for Event {
},
// Note that we do not write a length-prefixed TLV for ConnectionNeeded events.
35u8 => Ok(None),
37u8 => {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, peer_node_id, required),
(2, message, required),
});
Ok(Some(Event::OnionMessageIntercepted {
peer_node_id: peer_node_id.0.unwrap(), message: message.0.unwrap()
}))
};
f()
},
39u8 => {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
(0, peer_node_id, required),
});
Ok(Some(Event::OnionMessagePeerConnected {
peer_node_id: peer_node_id.0.unwrap()
}))
};
f()
},
// Note that we do not write a length-prefixed TLV for OnionMessageIntercepted events.
37u8 => Ok(None),
// Note that we do not write a length-prefixed TLV for OnionMessagePeerConnected events.
39u8 => Ok(None),
41u8 => {
let mut f = || {
_init_and_read_len_prefixed_tlv_fields!(reader, {
Expand Down

0 comments on commit 985056c

Please sign in to comment.