Partly addressed comments.

Author: Elias Rohrer

lightning/Cargo.toml

@@ -21,6 +21,7 @@ max_level_error = []
 max_level_warn = []
 max_level_info = []
 max_level_debug = []
+max_level_trace = []
 # Allow signing of local transactions that may have been revoked or will be revoked, for functional testing (e.g. justice tx handling).
 # This is unsafe to use in production because it may result in the counterparty publishing taking our funds.
 unsafe_revoked_tx_signing = []

lightning/src/ln/peer_handler.rs

@@ -892,7 +892,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 												match e {
 													msgs::DecodeError::UnknownVersion => return Err(PeerHandleError { no_connection_possible: false }),
 													msgs::DecodeError::UnknownRequiredFeature => {
-														log_gossip!(self.logger, "Got a channel/node announcement with an known required feature flag, you may want to update!");
+														log_gossip!(self.logger, "Got a channel/node announcement with an unknown required feature flag, you may want to update!");
 														continue;
 													}
 													msgs::DecodeError::InvalidValue => {
@@ -1120,7 +1120,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 				return Err(PeerHandleError{ no_connection_possible: true }.into());
 			},
 			wire::Message::Unknown(type_id) => {
-				log_gossip!(self.logger, "Received unknown odd message of type {}, ignoring", type_id);
+				log_trace!(self.logger, "Received unknown odd message of type {}, ignoring", type_id);
 			},
 			wire::Message::Custom(custom) => {
 				self.custom_message_handler.handle_custom_message(custom, &peer.their_node_id.unwrap())?;
@@ -1358,7 +1358,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 						}
 					},
 					MessageSendEvent::SendChannelUpdate { ref node_id, ref msg } => {
-						log_gossip!(self.logger, "Handling SendChannelUpdate event in peer_handler for node {} for channel {}",
+						log_trace!(self.logger, "Handling SendChannelUpdate event in peer_handler for node {} for channel {}",
 								log_pubkey!(node_id), msg.contents.short_channel_id);
 						let peer = get_peer_for_forwarding!(node_id);
 						peer.pending_outbound_buffer.push_back(peer.channel_encryptor.encrypt_message(&encode_msg!(msg)));
@@ -1369,7 +1369,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 								if let Some(mut descriptor) = peers.node_id_to_descriptor.remove(node_id) {
 									if let Some(mut peer) = peers.peers.remove(&descriptor) {
 										if let Some(ref msg) = *msg {
-											log_gossip!(self.logger, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
+											log_trace!(self.logger, "Handling DisconnectPeer HandleError event in peer_handler for node {} with message {}",
 													log_pubkey!(node_id),
 													msg.data);
 											self.enqueue_message(&mut peer, msg);

lightning/src/routing/network_graph.rs

@@ -299,7 +299,7 @@ where C::Target: chain::Access, L::Target: Logger
 
 	fn handle_channel_announcement(&self, msg: &msgs::ChannelAnnouncement) -> Result<bool, LightningError> {
 		self.network_graph.update_channel_from_announcement(msg, &self.chain_access, &self.secp_ctx)?;
-		log_trace!(self.logger, "Added channel_announcement for {}{}", msg.contents.short_channel_id, if !msg.contents.excess_data.is_empty() { " with excess uninterpreted data!" } else { "" });
+		log_gossip!(self.logger, "Added channel_announcement for {}{}", msg.contents.short_channel_id, if !msg.contents.excess_data.is_empty() { " with excess uninterpreted data!" } else { "" });
 		Ok(msg.contents.excess_data.len() <= MAX_EXCESS_BYTES_FOR_RELAY)
 	}
 

lightning/src/util/logger.rs

@@ -22,8 +22,8 @@ static LOG_LEVEL_NAMES: [&'static str; 6] = ["GOSSIP", "TRACE", "DEBUG", "INFO",
 /// An enum representing the available verbosity levels of the logger.
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Hash)]
 pub enum Level {
-    /// Designates extremely verbose information, including gossip-induced messages
-    Gossip,
+	/// Designates extremely verbose information, including gossip-induced messages
+	Gossip,
 	/// Designates very low priority, often extremely verbose, information
 	Trace,
 	/// Designates lower priority information
@@ -80,7 +80,7 @@ impl Level {
 	/// Returns the most verbose logging level.
 	#[inline]
 	pub fn max() -> Level {
-        Level::Gossip
+		Level::Gossip
 	}
 }
 
@@ -165,7 +165,7 @@ mod tests {
 			log_info!(self.logger, "This is an info");
 			log_debug!(self.logger, "This is a debug");
 			log_trace!(self.logger, "This is a trace");
-            log_gossip!(self.logger, "This is a gossip");
+			log_gossip!(self.logger, "This is a gossip");
 		}
 	}
 
@@ -192,10 +192,10 @@ mod tests {
 		assert!(Level::Debug > Level::Trace);
 		assert!(Level::Debug >= Level::Trace);
 		assert!(Level::Debug >= Level::Debug);
-        assert!(Level::Trace > Level::Gossip);
-        assert!(Level::Trace >= Level::Gossip);
-        assert!(Level::Trace >= Level::Trace);
-        assert!(Level::Gossip >= Level::Gossip);
+		assert!(Level::Trace > Level::Gossip);
+		assert!(Level::Trace >= Level::Gossip);
+		assert!(Level::Trace >= Level::Trace);
+		assert!(Level::Gossip >= Level::Gossip);
 
 		assert!(Level::Error <= Level::Error);
 		assert!(Level::Warn < Level::Error);
@@ -210,8 +210,8 @@ mod tests {
 		assert!(Level::Trace < Level::Debug);
 		assert!(Level::Trace <= Level::Debug);
 		assert!(Level::Trace <= Level::Trace);
-        assert!(Level::Gossip < Level::Trace);
-        assert!(Level::Gossip <= Level::Trace);
-        assert!(Level::Gossip <= Level::Gossip);
+		assert!(Level::Gossip < Level::Trace);
+		assert!(Level::Gossip <= Level::Trace);
+		assert!(Level::Gossip <= Level::Gossip);
 	}
 }