f Revert "Send warning instead of error when we incounter bogus gossip"

This reverts commit a29975d.

Author: TheBlueMatt

lightning/src/ln/msgs.rs

@@ -59,9 +59,6 @@ pub enum DecodeError {
 	/// or 1, a public key/private key/signature was invalid, text wasn't UTF-8, TLV was
 	/// syntactically incorrect, etc
 	InvalidValue,
-	/// Same as [`InvalidValue`], however this is set for gossip messages where we may not want to
-	/// force-close our channels with a counterparty and can instead send a [`Warning`] message.
-	InvalidGossipValue,
 	/// Buffer too short
 	ShortRead,
 	/// A length descriptor in the packet didn't describe the later data correctly
@@ -72,17 +69,6 @@ pub enum DecodeError {
 	/// The message included zlib-compressed values, which we don't support.
 	UnsupportedCompression,
 }
-impl DecodeError {
-	/// Map errors which may indicate a malformed message to `InvalidGossipValue` for use when
-	/// decoding gossip messages.
-	fn to_err_gossip_msg(self) -> Self {
-		match self {
-			DecodeError::Io(ioe) => DecodeError::Io(ioe),
-			DecodeError::UnsupportedCompression => self,
-			_ => DecodeError::InvalidGossipValue,
-		}
-	}
-}
 
 /// An init message to be sent or received from a peer
 #[derive(Clone, Debug, PartialEq)]
@@ -992,7 +978,6 @@ impl fmt::Display for DecodeError {
 			DecodeError::UnknownVersion => f.write_str("Unknown realm byte in Onion packet"),
 			DecodeError::UnknownRequiredFeature => f.write_str("Unknown required feature preventing decode"),
 			DecodeError::InvalidValue => f.write_str("Nonsense bytes didn't map to the type they were interpreted as"),
-			DecodeError::InvalidGossipValue => f.write_str("Nonsense bytes didn't map to the type they were interpreted as in a gossip message"),
 			DecodeError::ShortRead => f.write_str("Packet extended beyond the provided bytes"),
 			DecodeError::BadLengthDescriptor => f.write_str("A length descriptor in the packet didn't describe the later data correctly"),
 			DecodeError::Io(ref e) => e.fmt(f),
@@ -1453,8 +1438,8 @@ impl Writeable for UnsignedChannelAnnouncement {
 	}
 }
 
-impl UnsignedChannelAnnouncement {
-	fn do_read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+impl Readable for UnsignedChannelAnnouncement {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		Ok(Self {
 			features: Readable::read(r)?,
 			chain_hash: Readable::read(r)?,
@@ -1467,11 +1452,6 @@ impl UnsignedChannelAnnouncement {
 		})
 	}
 }
-impl Readable for UnsignedChannelAnnouncement {
-	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		Self::do_read(r).map_err(|e| e.to_err_gossip_msg())
-	}
-}
 
 impl_writeable!(ChannelAnnouncement, {
 	node_signature_1,
@@ -1502,8 +1482,8 @@ impl Writeable for UnsignedChannelUpdate {
 	}
 }
 
-impl UnsignedChannelUpdate {
-	fn do_read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+impl Readable for UnsignedChannelUpdate {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let has_htlc_maximum_msat;
 		Ok(Self {
 			chain_hash: Readable::read(r)?,
@@ -1524,11 +1504,6 @@ impl UnsignedChannelUpdate {
 		})
 	}
 }
-impl Readable for UnsignedChannelUpdate {
-	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		Self::do_read(r).map_err(|e| e.to_err_gossip_msg())
-	}
-}
 
 impl_writeable!(ChannelUpdate, {
 	signature,
@@ -1609,8 +1584,8 @@ impl Writeable for UnsignedNodeAnnouncement {
 	}
 }
 
-impl UnsignedNodeAnnouncement {
-	fn do_read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
+impl Readable for UnsignedNodeAnnouncement {
+	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
 		let features: NodeFeatures = Readable::read(r)?;
 		let timestamp: u32 = Readable::read(r)?;
 		let node_id: PublicKey = Readable::read(r)?;
@@ -1670,11 +1645,6 @@ impl UnsignedNodeAnnouncement {
 		})
 	}
 }
-impl Readable for UnsignedNodeAnnouncement {
-	fn read<R: Read>(r: &mut R) -> Result<Self, DecodeError> {
-		Self::do_read(r).map_err(|e| e.to_err_gossip_msg())
-	}
-}
 
 impl_writeable!(NodeAnnouncement, {
 	signature,

lightning/src/ln/peer_handler.rs

@@ -917,11 +917,6 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 													}
 													msgs::DecodeError::BadLengthDescriptor => return Err(PeerHandleError { no_connection_possible: false }),
 													msgs::DecodeError::Io(_) => return Err(PeerHandleError { no_connection_possible: false }),
-													msgs::DecodeError::InvalidGossipValue => {
-														log_gossip!(self.logger, "Got an invalid value while deserializing a gossip message");
-														self.enqueue_message(peer, &msgs::WarningMessage { channel_id: [0; 32], data: "You send a bogus/unreadable gossip message".to_owned() });
-														continue;
-													}
 													msgs::DecodeError::UnsupportedCompression => {
 														log_gossip!(self.logger, "We don't support zlib-compressed message fields, sending a warning and ignoring message");
 														self.enqueue_message(peer, &msgs::WarningMessage { channel_id: [0; 32], data: "Unsupported message compression: zlib".to_owned() });