f fix ser

Author: valentinewallace

lightning/src/routing/gossip.rs

@@ -31,7 +31,7 @@ use crate::routing::utxo::{self, UtxoLookup, UtxoResolver};
 use crate::util::indexed_map::{Entry as IndexedMapEntry, IndexedMap};
 use crate::util::logger::{Level, Logger};
 use crate::util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
-use crate::util::ser::{MaybeReadable, Readable, ReadableArgs, Writeable, Writer};
+use crate::util::ser::{MaybeReadable, Readable, ReadableArgs, RequiredWrapper, Writeable, Writer};
 use crate::util::string::PrintableString;
 
 use crate::io;
@@ -238,17 +238,67 @@ pub enum NetworkUpdate {
 	}
 }
 
-impl_writeable_tlv_based_enum_upgradable!(NetworkUpdate,
-	// 0 was used for channel updates in LDK versions 0.0.123 and below.
-	(2, ChannelFailure) => {
-		(0, short_channel_id, required),
-		(2, is_permanent, required),
-	},
-	(4, NodeFailure) => {
-		(0, node_id, required),
-		(2, is_permanent, required),
-	},
-);
+impl Writeable for NetworkUpdate {
+	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
+		match self {
+			Self::ChannelFailure { short_channel_id, is_permanent } => {
+				2u8.write(writer)?;
+				write_tlv_fields!(writer, {
+					(0, short_channel_id, required),
+					(2, is_permanent, required),
+				});
+			},
+			Self::NodeFailure { node_id, is_permanent } => {
+				4u8.write(writer)?;
+				write_tlv_fields!(writer, {
+					(0, node_id, required),
+					(2, is_permanent, required),
+				});
+			}
+		}
+		Ok(())
+	}
+}
+
+impl MaybeReadable for NetworkUpdate {
+	fn read<R: io::Read>(reader: &mut R) -> Result<Option<Self>, DecodeError> {
+		let id: u8 = Readable::read(reader)?;
+		match id {
+			0 => {
+				let mut msg: RequiredWrapper<ChannelUpdate> = RequiredWrapper(None);
+				read_tlv_fields!(reader, {
+					(0, msg, required),
+				});
+				Ok(Some(Self::ChannelFailure {
+					short_channel_id: msg.0.unwrap().contents.short_channel_id,
+					is_permanent: false
+				}))
+			},
+			2 => {
+				_init_and_read_len_prefixed_tlv_fields!(reader, {
+					(0, short_channel_id, required),
+					(2, is_permanent, required),
+				});
+				Ok(Some(Self::ChannelFailure {
+					short_channel_id: short_channel_id.0.unwrap(),
+					is_permanent: is_permanent.0.unwrap(),
+				}))
+			},
+			4 => {
+				_init_and_read_len_prefixed_tlv_fields!(reader, {
+					(0, node_id, required),
+					(2, is_permanent, required),
+				});
+				Ok(Some(Self::NodeFailure {
+					node_id: node_id.0.unwrap(),
+					is_permanent: is_permanent.0.unwrap(),
+				}))
+			}
+			t if t % 2 == 0 => Err(DecodeError::UnknownRequiredFeature),
+			_ => Ok(None),
+		}
+	}
+}
 
 /// Receives and validates network updates from peers,
 /// stores authentic and relevant data as a network graph.