f - Use impl_writeable_tlv_based_enum_upgradable for NetworkUpdate

Author: jkczyz

lightning/src/routing/network_graph.rs

@@ -96,19 +96,19 @@ pub enum NetworkUpdate {
 	}
 }
 
-impl_writeable_tlv_based_enum!(NetworkUpdate,
+impl_writeable_tlv_based_enum_upgradable!(NetworkUpdate,
 	(0, ChannelUpdateMessage) => {
 		(0, msg, required),
 	},
-	(1, ChannelClosed) => {
+	(2, ChannelClosed) => {
 		(0, short_channel_id, required),
 		(2, is_permanent, required),
 	},
-	(2, NodeFailure) => {
+	(4, NodeFailure) => {
 		(0, node_id, required),
 		(2, is_permanent, required),
 	},
-;);
+);
 
 /// Receives and validates network updates from peers,
 /// stores authentic and relevant data as a network graph.

lightning/src/util/events.rs

@@ -318,7 +318,7 @@ impl MaybeReadable for Event {
 					let mut network_update = None;
 					read_tlv_fields!(reader, {
 						(0, payment_hash, required),
-						(1, network_update, option),
+						(1, network_update, ignorable),
 						(2, rejected_by_dest, required),
 					});
 					Ok(Some(Event::PaymentFailed {