Move NetworkGraph inner structs to TLV storage

Author: TheBlueMatt

lightning/src/routing/network_graph.rs

@@ -521,24 +521,7 @@ pub struct RoutingFees {
 	pub proportional_millionths: u32,
 }
 
-impl Readable for RoutingFees{
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<RoutingFees, DecodeError> {
-		let base_msat: u32 = Readable::read(reader)?;
-		let proportional_millionths: u32 = Readable::read(reader)?;
-		Ok(RoutingFees {
-			base_msat,
-			proportional_millionths,
-		})
-	}
-}
-
-impl Writeable for RoutingFees {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.base_msat.write(writer)?;
-		self.proportional_millionths.write(writer)?;
-		Ok(())
-	}
-}
+impl_writeable_tlv_based!(RoutingFees, {(0, base_msat, 0), (2, proportional_millionths, 0)}, {}, {});
 
 #[derive(Clone, Debug, PartialEq)]
 /// Information received in the latest node_announcement from this node.
@@ -565,25 +548,22 @@ pub struct NodeAnnouncementInfo {
 
 impl Writeable for NodeAnnouncementInfo {
 	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		self.features.write(writer)?;
-		self.last_update.write(writer)?;
-		self.rgb.write(writer)?;
-		self.alias.write(writer)?;
 		(self.addresses.len() as u64).write(writer)?;
 		for ref addr in &self.addresses {
 			addr.write(writer)?;
 		}
-		self.announcement_message.write(writer)?;
+		write_tlv_fields!(writer, {
+			(0, self.features),
+			(2, self.last_update),
+			(4, self.rgb),
+			(6, self.alias)
+		}, { (8, self.announcement_message) });
 		Ok(())
 	}
 }
 
 impl Readable for NodeAnnouncementInfo {
 	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<NodeAnnouncementInfo, DecodeError> {
-		let features = Readable::read(reader)?;
-		let last_update = Readable::read(reader)?;
-		let rgb = Readable::read(reader)?;
-		let alias = Readable::read(reader)?;
 		let addresses_count: u64 = Readable::read(reader)?;
 		let mut addresses = Vec::with_capacity(cmp::min(addresses_count, MAX_ALLOC_SIZE / 40) as usize);
 		for _ in 0..addresses_count {
@@ -594,7 +574,17 @@ impl Readable for NodeAnnouncementInfo {
 				_ => unreachable!(),
 			}
 		}
-		let announcement_message = Readable::read(reader)?;
+		let mut features = NodeFeatures::empty();
+		let mut last_update = 0;
+		let mut rgb = [0; 3];
+		let mut alias = [0; 32];
+		let mut announcement_message = None;
+		read_tlv_fields!(reader, {
+			(0, features),
+			(2, last_update),
+			(4, rgb),
+			(6, alias)
+		}, { (8, announcement_message) });
 		Ok(NodeAnnouncementInfo {
 			features,
 			last_update,
@@ -629,37 +619,15 @@ impl fmt::Display for NodeInfo {
 	}
 }
 
-impl Writeable for NodeInfo {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		(self.channels.len() as u64).write(writer)?;
-		for ref chan in self.channels.iter() {
-			chan.write(writer)?;
-		}
-		self.lowest_inbound_channel_fees.write(writer)?;
-		self.announcement_info.write(writer)?;
-		Ok(())
-	}
-}
+impl_writeable_tlv_based!(NodeInfo, {}, {
+	(0, lowest_inbound_channel_fees),
+	(2, announcement_info),
+}, {
+	(4, channels),
+});
 
 const MAX_ALLOC_SIZE: u64 = 64*1024;
 
-impl Readable for NodeInfo {
-	fn read<R: ::std::io::Read>(reader: &mut R) -> Result<NodeInfo, DecodeError> {
-		let channels_count: u64 = Readable::read(reader)?;
-		let mut channels = Vec::with_capacity(cmp::min(channels_count, MAX_ALLOC_SIZE / 8) as usize);
-		for _ in 0..channels_count {
-			channels.push(Readable::read(reader)?);
-		}
-		let lowest_inbound_channel_fees = Readable::read(reader)?;
-		let announcement_info = Readable::read(reader)?;
-		Ok(NodeInfo {
-			channels,
-			lowest_inbound_channel_fees,
-			announcement_info,
-		})
-	}
-}
-
 const SERIALIZATION_VERSION: u8 = 1;
 const MIN_SERIALIZATION_VERSION: u8 = 1;