f Write as required option.

Author: tnull

lightning/src/util/events.rs

@@ -887,8 +887,8 @@ impl Writeable for Event {
 				write_tlv_fields!(writer, {
 					(0, channel_id, required),
 					(2, user_channel_id, required),
-					(4, counterparty_node_id, required),
-					(6, channel_type, required),
+					(4, Some(counterparty_node_id), required),
+					(6, Some(channel_type), required),
 				});
 			},
 			// Note that, going forward, all new events must only write data inside of
@@ -1181,8 +1181,8 @@ impl MaybeReadable for Event {
 					read_tlv_fields!(reader, {
 						(0, channel_id, required),
 						(2, user_channel_id, required),
-						(4, counterparty_node_id_opt, option),
-						(6, channel_type_opt, option),
+						(4, counterparty_node_id_opt, required),
+						(6, channel_type_opt, required),
 					});
 
 					Ok(Some(Event::ChannelReady {