f Only log required features

Author: tnull

lightning/src/ln/features.rs

@@ -784,7 +784,7 @@ impl<T: sealed::Context> Features<T> {
 		})
 	}
 
-	pub(crate) fn unknown_bits_from(&self, other: &Self) -> Vec<usize> {
+	pub(crate) fn required_unknown_bits_from(&self, other: &Self) -> Vec<usize> {
 		let mut unknown_bits = Vec::new();
 
 		// Bitwise AND-ing with all even bits set except for known features will select required
@@ -801,7 +801,7 @@ impl<T: sealed::Context> Features<T> {
 				0b11_11_11_11
 			};
 
-			if byte & unknown_features != 0 {
+			if byte & (REQUIRED_FEATURES & unknown_features) != 0 {
 				for bit in 0..8 {
 					if byte >> bit & 1 == 1 {
 						unknown_bits.push(i * 8 + bit);
@@ -1063,13 +1063,13 @@ mod tests {
 		features.set_unknown_feature_required();
 		assert!(features.requires_unknown_bits());
 		assert!(features.supports_unknown_bits());
-		assert_eq!(features.unknown_bits_from(&ChannelFeatures::empty()), vec![123456788]);
+		assert_eq!(features.required_unknown_bits_from(&ChannelFeatures::empty()), vec![123456788]);
 
 		let mut features = ChannelFeatures::empty();
 		features.set_unknown_feature_optional();
 		assert!(!features.requires_unknown_bits());
 		assert!(features.supports_unknown_bits());
-		assert_eq!(features.unknown_bits_from(&ChannelFeatures::empty()), vec![123456789]);
+		assert_eq!(features.required_unknown_bits_from(&ChannelFeatures::empty()), vec![]);
 	}
 
 	#[test]

lightning/src/ln/peer_handler.rs

@@ -1649,13 +1649,13 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 			let our_features = self.init_features(&their_node_id);
 			if msg.features.requires_unknown_bits_from(&our_features) {
 				log_debug!(logger, "Peer {} requires features unknown to us: {:?}",
-					log_pubkey!(their_node_id), msg.features.unknown_bits_from(&our_features));
+					log_pubkey!(their_node_id), msg.features.required_unknown_bits_from(&our_features));
 				return Err(PeerHandleError { }.into());
 			}
 
 			if our_features.requires_unknown_bits_from(&msg.features) {
 				log_debug!(logger, "We require features unknown to our peer {}: {:?}",
-					log_pubkey!(their_node_id), our_features.unknown_bits_from(&msg.features));
+					log_pubkey!(their_node_id), our_features.required_unknown_bits_from(&msg.features));
 				return Err(PeerHandleError { }.into());
 			}