Skip to content

Commit 6e83263

Browse files
committed
Drop serialization for OnionMessage{Intercepted,PeerConnected}
.. event variants, as we never serialize them anyways.
1 parent 1fdbacb commit 6e83263

File tree

1 file changed

+8
-32
lines changed

1 file changed

+8
-32
lines changed

lightning/src/events/mod.rs

Lines changed: 8 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1609,18 +1609,13 @@ impl Writeable for Event {
16091609
35u8.write(writer)?;
16101610
// Never write ConnectionNeeded events as buffered onion messages aren't serialized.
16111611
},
1612-
&Event::OnionMessageIntercepted { ref peer_node_id, ref message } => {
1612+
&Event::OnionMessageIntercepted { .. } => {
16131613
37u8.write(writer)?;
1614-
write_tlv_fields!(writer, {
1615-
(0, peer_node_id, required),
1616-
(2, message, required),
1617-
});
1614+
// Never write OnionMessageIntercepted events as buffered onion messages aren't serialized.
16181615
},
1619-
&Event::OnionMessagePeerConnected { ref peer_node_id } => {
1616+
&Event::OnionMessagePeerConnected { .. } => {
16201617
39u8.write(writer)?;
1621-
write_tlv_fields!(writer, {
1622-
(0, peer_node_id, required),
1623-
});
1618+
// Never write OnionMessage events as buffered onion messages aren't serialized.
16241619
},
16251620
&Event::InvoiceReceived { ref payment_id, ref invoice, ref responder } => {
16261621
41u8.write(writer)?;
@@ -2043,29 +2038,10 @@ impl MaybeReadable for Event {
20432038
},
20442039
// Note that we do not write a length-prefixed TLV for ConnectionNeeded events.
20452040
35u8 => Ok(None),
2046-
37u8 => {
2047-
let mut f = || {
2048-
_init_and_read_len_prefixed_tlv_fields!(reader, {
2049-
(0, peer_node_id, required),
2050-
(2, message, required),
2051-
});
2052-
Ok(Some(Event::OnionMessageIntercepted {
2053-
peer_node_id: peer_node_id.0.unwrap(), message: message.0.unwrap()
2054-
}))
2055-
};
2056-
f()
2057-
},
2058-
39u8 => {
2059-
let mut f = || {
2060-
_init_and_read_len_prefixed_tlv_fields!(reader, {
2061-
(0, peer_node_id, required),
2062-
});
2063-
Ok(Some(Event::OnionMessagePeerConnected {
2064-
peer_node_id: peer_node_id.0.unwrap()
2065-
}))
2066-
};
2067-
f()
2068-
},
2041+
// Note that we do not write a length-prefixed TLV for OnionMessageIntercepted events.
2042+
37u8 => Ok(None),
2043+
// Note that we do not write a length-prefixed TLV for OnionMessagePeerConnected events.
2044+
39u8 => Ok(None),
20692045
41u8 => {
20702046
let mut f = || {
20712047
_init_and_read_len_prefixed_tlv_fields!(reader, {

0 commit comments

Comments
 (0)