Don't advertise onion messages in known channel features

Author: valentinewallace

lightning/src/ln/features.rs

@@ -559,14 +559,17 @@ impl InitFeatures {
 		Self::known()
 			.clear_initial_routing_sync()
 			.clear_gossip_queries()
+			.clear_onion_messages()
 	}
 }
 
 impl NodeFeatures {
 	/// Returns the set of known node features that are related to channels. At least some of
 	/// these features are likely required for peers to talk to us.
 	pub fn known_channel_features() -> NodeFeatures {
-		Self::known().clear_gossip_queries()
+		Self::known()
+			.clear_gossip_queries()
+			.clear_onion_messages()
 	}
 }
 
@@ -800,6 +803,13 @@ impl<T: sealed::InitialRoutingSync> Features<T> {
 	}
 }
 
+impl<T: sealed::OnionMessages> Features<T> {
+	pub(crate) fn clear_onion_messages(mut self) -> Self {
+		<T as sealed::OnionMessages>::clear_bits(&mut self.flags);
+		self
+	}
+}
+
 impl<T: sealed::ShutdownAnySegwit> Features<T> {
 	#[cfg(test)]
 	pub(crate) fn clear_shutdown_anysegwit(mut self) -> Self {