X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Frouting%2Fnetwork_graph.rs;h=80a7010bd18dd50de0a9fa0854ba74f99f61f707;hb=2b08a47e887913c8b056192d5b9df4569cf32548;hp=2c55d0a1d525c7f16450983698f120109a0843fc;hpb=c5a6135edcf3c30520d6b1c8e26991feaaf87429;p=rust-lightning

diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
index 2c55d0a1..80a7010b 100644
--- a/lightning/src/routing/network_graph.rs
+++ b/lightning/src/routing/network_graph.rs
@@ -28,7 +28,7 @@ use ln::msgs::{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, OptionalFie
 use ln::msgs::{QueryChannelRange, ReplyChannelRange, QueryShortChannelIds, ReplyShortChannelIdsEnd};
 use ln::msgs;
 use util::ser::{Writeable, Readable, Writer};
-use util::logger::Logger;
+use util::logger::{Logger, Level};
 use util::events::{MessageSendEvent, MessageSendEventsProvider};
 use util::scid_utils::{block_from_scid, scid_from_parts, MAX_SCID_BLOCK};
 
@@ -464,14 +464,14 @@ impl fmt::Display for DirectionalChannelInfo {
 }
 
 impl_writeable_tlv_based!(DirectionalChannelInfo, {
-	(0, last_update),
-	(2, enabled),
-	(4, cltv_expiry_delta),
-	(6, htlc_minimum_msat),
-	(8, htlc_maximum_msat),
-	(10, fees),
-	(12, last_update_message),
-}, {}, {});
+	(0, last_update, required),
+	(2, enabled, required),
+	(4, cltv_expiry_delta, required),
+	(6, htlc_minimum_msat, required),
+	(8, htlc_maximum_msat, required),
+	(10, fees, required),
+	(12, last_update_message, required),
+});
 
 #[derive(Clone, Debug, PartialEq)]
 /// Details about a channel (both directions).
@@ -505,14 +505,14 @@ impl fmt::Display for ChannelInfo {
 }
 
 impl_writeable_tlv_based!(ChannelInfo, {
-	(0, features),
-	(2, node_one),
-	(4, one_to_two),
-	(6, node_two),
-	(8, two_to_one),
-	(10, capacity_sats),
-	(12, announcement_message),
-}, {}, {});
+	(0, features, required),
+	(2, node_one, required),
+	(4, one_to_two, required),
+	(6, node_two, required),
+	(8, two_to_one, required),
+	(10, capacity_sats, required),
+	(12, announcement_message, required),
+});
 
 
 /// Fees for routing via a given channel or a node
@@ -525,7 +525,10 @@ pub struct RoutingFees {
 	pub proportional_millionths: u32,
 }
 
-impl_writeable_tlv_based!(RoutingFees, {(0, base_msat), (2, proportional_millionths)}, {}, {});
+impl_writeable_tlv_based!(RoutingFees, {
+	(0, base_msat, required),
+	(2, proportional_millionths, required)
+});
 
 #[derive(Clone, Debug, PartialEq)]
 /// Information received in the latest node_announcement from this node.
@@ -551,14 +554,12 @@ pub struct NodeAnnouncementInfo {
 }
 
 impl_writeable_tlv_based!(NodeAnnouncementInfo, {
-	(0, features),
-	(2, last_update),
-	(4, rgb),
-	(6, alias),
-}, {
-	(8, announcement_message),
-}, {
-	(10, addresses),
+	(0, features, required),
+	(2, last_update, required),
+	(4, rgb, required),
+	(6, alias, required),
+	(8, announcement_message, option),
+	(10, addresses, vec_type),
 });
 
 #[derive(Clone, Debug, PartialEq)]
@@ -584,11 +585,10 @@ impl fmt::Display for NodeInfo {
 	}
 }
 
-impl_writeable_tlv_based!(NodeInfo, {}, {
-	(0, lowest_inbound_channel_fees),
-	(2, announcement_info),
-}, {
-	(4, channels),
+impl_writeable_tlv_based!(NodeInfo, {
+	(0, lowest_inbound_channel_fees, option),
+	(2, announcement_info, option),
+	(4, channels, vec_type),
 });
 
 const SERIALIZATION_VERSION: u8 = 1;
@@ -610,7 +610,7 @@ impl Writeable for NetworkGraph {
 			node_info.write(writer)?;
 		}
 
-		write_tlv_fields!(writer, {}, {});
+		write_tlv_fields!(writer, {});
 		Ok(())
 	}
 }
@@ -634,7 +634,7 @@ impl Readable for NetworkGraph {
 			let node_info = Readable::read(reader)?;
 			nodes.insert(node_id, node_info);
 		}
-		read_tlv_fields!(reader, {}, {});
+		read_tlv_fields!(reader, {});
 
 		Ok(NetworkGraph {
 			genesis_hash,
@@ -717,7 +717,7 @@ impl NetworkGraph {
 			Some(node) => {
 				if let Some(node_info) = node.announcement_info.as_ref() {
 					if node_info.last_update  >= msg.timestamp {
-						return Err(LightningError{err: "Update older than last processed update".to_owned(), action: ErrorAction::IgnoreError});
+						return Err(LightningError{err: "Update older than last processed update".to_owned(), action: ErrorAction::IgnoreAndLog(Level::Trace)});
 					}
 				}
 
@@ -838,7 +838,7 @@ impl NetworkGraph {
 					Self::remove_channel_in_nodes(&mut self.nodes, &entry.get(), msg.short_channel_id);
 					*entry.get_mut() = chan_info;
 				} else {
-					return Err(LightningError{err: "Already have knowledge of channel".to_owned(), action: ErrorAction::IgnoreError})
+					return Err(LightningError{err: "Already have knowledge of channel".to_owned(), action: ErrorAction::IgnoreAndLog(Level::Trace)})
 				}
 			},
 			BtreeEntry::Vacant(entry) => {
@@ -940,7 +940,7 @@ impl NetworkGraph {
 					( $target: expr, $src_node: expr) => {
 						if let Some(existing_chan_info) = $target.as_ref() {
 							if existing_chan_info.last_update >= msg.timestamp {
-								return Err(LightningError{err: "Update older than last processed update".to_owned(), action: ErrorAction::IgnoreError});
+								return Err(LightningError{err: "Update older than last processed update".to_owned(), action: ErrorAction::IgnoreAndLog(Level::Trace)});
 							}
 							chan_was_enabled = existing_chan_info.enabled;
 						} else {