f use clear_bits

Author: valentinewallace

lightning/src/ln/channelmanager.rs

@@ -2973,10 +2973,12 @@ impl<Signer: Sign, M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelMana
 		// addresses be sorted for future compatibility.
 		addresses.sort_by_key(|addr| addr.get_id());
 
-		let node_features = if self.advertise_onion_message_support.load(Ordering::Acquire) {
-			NodeFeatures::known() } else { NodeFeatures::known_without_onion_messages() };
+		let mut features = NodeFeatures::known();
+		if !self.advertise_onion_message_support.load(Ordering::Acquire) {
+			features = features.clear_onion_messages();
+		}
 		let announcement = msgs::UnsignedNodeAnnouncement {
-			features: node_features,
+			features,
 			timestamp: self.last_node_announcement_serial.fetch_add(1, Ordering::AcqRel) as u32,
 			node_id: self.get_our_node_id(),
 			rgb, alias, addresses,

lightning/src/ln/features.rs

@@ -550,14 +550,6 @@ impl InitFeatures {
 	}
 }
 
-impl NodeFeatures {
-	pub(crate) fn known_without_onion_messages() -> Self {
-		let mut features = Self::known();
-		features.flags[4] &= 0b00111111;
-		features
-	}
-}
-
 impl InvoiceFeatures {
 	/// Converts `InvoiceFeatures` to `Features<C>`. Only known `InvoiceFeatures` relevant to
 	/// context `C` are included in the result.
@@ -807,6 +799,13 @@ impl<T: sealed::Wumbo> 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
+	}
+}
+
 macro_rules! impl_feature_len_prefixed_write {
 	($features: ident) => {
 		impl Writeable for $features {
@@ -921,8 +920,8 @@ mod tests {
 		assert!(NodeFeatures::known().supports_onion_messages());
 		assert!(!InitFeatures::known().requires_onion_messages());
 		assert!(!NodeFeatures::known().requires_onion_messages());
-		assert!(!NodeFeatures::known_without_onion_messages().supports_onion_messages());
-		assert!(!NodeFeatures::known_without_onion_messages().requires_onion_messages());
+		assert!(!InitFeatures::known().clear_onion_messages().supports_onion_messages());
+		assert!(!NodeFeatures::known().clear_onion_messages().supports_onion_messages());
 
 		assert!(InitFeatures::known().supports_zero_conf());
 		assert!(!InitFeatures::known().requires_zero_conf());