f Use OptionDeserWrapper

Author: tnull

lightning/src/util/events.rs

@@ -24,7 +24,7 @@ use crate::ln::msgs;
 use crate::ln::msgs::DecodeError;
 use crate::ln::{PaymentPreimage, PaymentHash, PaymentSecret};
 use crate::routing::gossip::NetworkUpdate;
-use crate::util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper};
+use crate::util::ser::{BigSize, FixedLengthReader, Writeable, Writer, MaybeReadable, Readable, VecReadWrapper, VecWriteWrapper, OptionDeserWrapper};
 use crate::routing::router::{RouteHop, RouteParameters};
 
 use bitcoin::{PackedLockTime, Transaction};
@@ -1176,20 +1176,20 @@ impl MaybeReadable for Event {
 				let f = || {
 					let mut channel_id = [0; 32];
 					let mut user_channel_id: u64 = 0;
-					let mut counterparty_node_id_opt = None;
-					let mut channel_type_opt = None;
+					let mut counterparty_node_id = OptionDeserWrapper(None);
+					let mut channel_type = OptionDeserWrapper(None);
 					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, required),
+						(6, channel_type, required),
 					});
 
 					Ok(Some(Event::ChannelReady {
 						channel_id,
 						user_channel_id,
-						counterparty_node_id: counterparty_node_id_opt.unwrap(),
-						channel_type: channel_type_opt.unwrap()
+						counterparty_node_id: counterparty_node_id.0.unwrap(),
+						channel_type: channel_type.0.unwrap()
 					}))
 				};
 				f()