f - don't serialize ConnectionNeeded events

Author: jkczyz

lightning/src/events/mod.rs

@@ -1192,12 +1192,9 @@ impl Writeable for Event {
 					(0, payment_id, required),
 				})
 			},
-			&Event::ConnectionNeeded { ref node_id, ref addresses } => {
+			&Event::ConnectionNeeded { .. } => {
 				35u8.write(writer)?;
-				write_tlv_fields!(writer, {
-					(0, node_id, required),
-					(2, *addresses, required_vec),
-				})
+				// Never write ConnectionNeeded events as buffered onion messages aren't serialized.
 			},
 			// Note that, going forward, all new events must only write data inside of
 			// `write_tlv_fields`. Versions 0.0.101+ will ignore odd-numbered events that write
@@ -1209,9 +1206,9 @@ impl Writeable for Event {
 impl MaybeReadable for Event {
 	fn read<R: io::Read>(reader: &mut R) -> Result<Option<Self>, msgs::DecodeError> {
 		match Readable::read(reader)? {
-			// Note that we do not write a length-prefixed TLV for FundingGenerationReady events,
-			// unlike all other events, thus we return immediately here.
-			0u8 => Ok(None),
+			// Note that we do not write a length-prefixed TLV for FundingGenerationReady and
+			// ConnectionNeeded events, unlike all other events, thus we return immediately here.
+			0u8 | 35u8 => Ok(None),
 			1u8 => {
 				let f = || {
 					let mut payment_hash = PaymentHash([0; 32]);
@@ -1597,19 +1594,6 @@ impl MaybeReadable for Event {
 				};
 				f()
 			},
-			35u8 => {
-				let f = || {
-					_init_and_read_len_prefixed_tlv_fields!(reader, {
-						(0, node_id, required),
-						(2, addresses, required_vec),
-					});
-					Ok(Some(Event::ConnectionNeeded {
-						node_id: node_id.0.unwrap(),
-						addresses,
-					}))
-				};
-				f()
-			},
 			// Versions prior to 0.0.100 did not ignore odd types, instead returning InvalidValue.
 			// Version 0.0.100 failed to properly ignore odd types, possibly resulting in corrupt
 			// reads.