X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fln%2Fmsgs.rs;h=712158a97bc604a39ba173e714e8bbeafbfcd399;hb=d873e7278946e12ed591b23f1f4014adc09f5770;hp=8517e85d8c299436ad42d6bf2b8f27e399a55faa;hpb=c7ddcd3867757c74d8a3a2997604edf52aa0a536;p=rust-lightning

diff --git a/lightning/src/ln/msgs.rs b/lightning/src/ln/msgs.rs
index 8517e85d..712158a9 100644
--- a/lightning/src/ln/msgs.rs
+++ b/lightning/src/ln/msgs.rs
@@ -33,6 +33,7 @@ use bitcoin::hash_types::{Txid, BlockHash};
 use ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 
 use std::{cmp, fmt};
+use std::fmt::Debug;
 use std::io::Read;
 
 use util::events::MessageSendEventsProvider;
@@ -44,7 +45,7 @@ use ln::channelmanager::{PaymentPreimage, PaymentHash, PaymentSecret};
 pub(crate) const MAX_VALUE_MSAT: u64 = 21_000_000_0000_0000_000;
 
 /// An error in decoding a message or struct.
-#[derive(Debug)]
+#[derive(Clone, Debug)]
 pub enum DecodeError {
 	/// A version byte specified something we don't know how to handle.
 	/// Includes unknown realm byte in an OnionHopData packet
@@ -60,7 +61,7 @@ pub enum DecodeError {
 	/// A length descriptor in the packet didn't describe the later data correctly
 	BadLengthDescriptor,
 	/// Error from std::io
-	Io(::std::io::Error),
+	Io(::std::io::ErrorKind),
 }
 
 /// An init message to be sent or received from a peer
@@ -390,15 +391,6 @@ pub enum NetAddress {
 	},
 }
 impl NetAddress {
-	fn get_id(&self) -> u8 {
-		match self {
-			&NetAddress::IPv4 {..} => { 1 },
-			&NetAddress::IPv6 {..} => { 2 },
-			&NetAddress::OnionV2 {..} => { 3 },
-			&NetAddress::OnionV3 {..} => { 4 },
-		}
-	}
-
 	/// Strict byte-length of address descriptor, 1-byte type not recorded
 	fn len(&self) -> u16 {
 		match self {
@@ -602,9 +594,8 @@ pub struct ReplyChannelRange {
 	pub first_blocknum: u32,
 	/// The number of blocks included in the range of the reply
 	pub number_of_blocks: u32,
-	/// Indicates if the query recipient maintains up-to-date channel
-	/// information for the chain_hash
-	pub full_information: bool,
+	/// True when this is the final reply for a query
+	pub sync_complete: bool,
 	/// The short_channel_ids in the channel range
 	pub short_channel_ids: Vec<u64>,
 }
@@ -675,6 +666,7 @@ pub enum ErrorAction {
 }
 
 /// An Err type for failure to process messages.
+#[derive(Clone)]
 pub struct LightningError {
 	/// A human-readable message describing the error
 	pub err: String,
@@ -950,7 +942,7 @@ impl From<::std::io::Error> for DecodeError {
 		if e.kind() == ::std::io::ErrorKind::UnexpectedEof {
 			DecodeError::ShortRead
 		} else {
-			DecodeError::Io(e)
+			DecodeError::Io(e.kind())
 		}
 	}
 }
@@ -1534,14 +1526,12 @@ impl Writeable for UnsignedNodeAnnouncement {
 		w.write_all(&self.rgb)?;
 		self.alias.write(w)?;
 
-		let mut addrs_to_encode = self.addresses.clone();
-		addrs_to_encode.sort_by(|a, b| { a.get_id().cmp(&b.get_id()) });
 		let mut addr_len = 0;
-		for addr in &addrs_to_encode {
+		for addr in self.addresses.iter() {
 			addr_len += 1 + addr.len();
 		}
 		(addr_len + self.excess_address_data.len() as u16).write(w)?;
-		for addr in addrs_to_encode {
+		for addr in self.addresses.iter() {
 			addr.write(w)?;
 		}
 		w.write_all(&self.excess_address_data[..])?;
@@ -1561,7 +1551,6 @@ impl Readable for UnsignedNodeAnnouncement {
 
 		let addr_len: u16 = Readable::read(r)?;
 		let mut addresses: Vec<NetAddress> = Vec::new();
-		let mut highest_addr_type = 0;
 		let mut addr_readpos = 0;
 		let mut excess = false;
 		let mut excess_byte = 0;
@@ -1569,11 +1558,6 @@ impl Readable for UnsignedNodeAnnouncement {
 			if addr_len <= addr_readpos { break; }
 			match Readable::read(r) {
 				Ok(Ok(addr)) => {
-					if addr.get_id() < highest_addr_type {
-						// Addresses must be sorted in increasing order
-						return Err(DecodeError::InvalidValue);
-					}
-					highest_addr_type = addr.get_id();
 					if addr_len < addr_readpos + 1 + addr.len() {
 						return Err(DecodeError::BadLengthDescriptor);
 					}
@@ -1727,7 +1711,7 @@ impl Readable for ReplyChannelRange {
 		let chain_hash: BlockHash = Readable::read(r)?;
 		let first_blocknum: u32 = Readable::read(r)?;
 		let number_of_blocks: u32 = Readable::read(r)?;
-		let full_information: bool = Readable::read(r)?;
+		let sync_complete: bool = Readable::read(r)?;
 
 		// We expect the encoding_len to always includes the 1-byte
 		// encoding_type and that short_channel_ids are 8-bytes each
@@ -1755,7 +1739,7 @@ impl Readable for ReplyChannelRange {
 			chain_hash,
 			first_blocknum,
 			number_of_blocks,
-			full_information,
+			sync_complete,
 			short_channel_ids
 		})
 	}
@@ -1768,7 +1752,7 @@ impl Writeable for ReplyChannelRange {
 		self.chain_hash.write(w)?;
 		self.first_blocknum.write(w)?;
 		self.number_of_blocks.write(w)?;
-		self.full_information.write(w)?;
+		self.sync_complete.write(w)?;
 
 		encoding_len.write(w)?;
 		(EncodingType::Uncompressed as u8).write(w)?;
@@ -2569,7 +2553,7 @@ mod tests {
 			chain_hash: expected_chain_hash,
 			first_blocknum: 756230,
 			number_of_blocks: 1500,
-			full_information: true,
+			sync_complete: true,
 			short_channel_ids: vec![0x000000000000008e, 0x0000000000003c69, 0x000000000045a6c4],
 		};
 
@@ -2582,7 +2566,7 @@ mod tests {
 			assert_eq!(reply_channel_range.chain_hash, expected_chain_hash);
 			assert_eq!(reply_channel_range.first_blocknum, 756230);
 			assert_eq!(reply_channel_range.number_of_blocks, 1500);
-			assert_eq!(reply_channel_range.full_information, true);
+			assert_eq!(reply_channel_range.sync_complete, true);
 			assert_eq!(reply_channel_range.short_channel_ids[0], 0x000000000000008e);
 			assert_eq!(reply_channel_range.short_channel_ids[1], 0x0000000000003c69);
 			assert_eq!(reply_channel_range.short_channel_ids[2], 0x000000000045a6c4);