f net_graph

Author: TheBlueMatt

lightning/src/ln/msgs.rs

@@ -482,6 +482,17 @@ impl Readable for Result<NetAddress, u8> {
 	}
 }
 
+impl Readable for NetAddress {
+	fn read<R: Read>(reader: &mut R) -> Result<NetAddress, DecodeError> {
+		match Readable::read(reader) {
+			Ok(Ok(res)) => Ok(res),
+			Ok(Err(_)) => Err(DecodeError::UnknownVersion),
+			Err(e) => Err(e),
+		}
+	}
+}
+
+
 /// The unsigned part of a node_announcement
 #[derive(Clone, Debug, PartialEq)]
 pub struct UnsignedNodeAnnouncement {

lightning/src/routing/network_graph.rs

@@ -546,55 +546,16 @@ pub struct NodeAnnouncementInfo {
 	pub announcement_message: Option<NodeAnnouncement>
 }
 
-impl Writeable for NodeAnnouncementInfo {
-	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), ::std::io::Error> {
-		(self.addresses.len() as u64).write(writer)?;
-		for ref addr in &self.addresses {
-			addr.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 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 {
-			match Readable::read(reader) {
-				Ok(Ok(addr)) => { addresses.push(addr); },
-				Ok(Err(_)) => return Err(DecodeError::InvalidValue),
-				Err(DecodeError::ShortRead) => return Err(DecodeError::BadLengthDescriptor),
-				_ => unreachable!(),
-			}
-		}
-		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,
-			rgb,
-			alias,
-			addresses,
-			announcement_message
-		})
-	}
-}
+impl_writeable_tlv_based!(NodeAnnouncementInfo, {
+	(0, features),
+	(2, last_update),
+	(4, rgb),
+	(6, alias),
+}, {
+	(8, announcement_message),
+}, {
+	(10, addresses),
+});
 
 #[derive(Clone, Debug, PartialEq)]
 /// Details about a node in the network, known from the network announcement.
@@ -626,8 +587,6 @@ impl_writeable_tlv_based!(NodeInfo, {}, {
 	(4, channels),
 });
 
-const MAX_ALLOC_SIZE: u64 = 64*1024;
-
 const SERIALIZATION_VERSION: u8 = 1;
 const MIN_SERIALIZATION_VERSION: u8 = 1;