f send logic

Author: TheBlueMatt

lightning/src/ln/channel.rs

@@ -752,9 +752,9 @@ impl<Signer: Sign> Channel<Signer> {
 			#[cfg(any(test, feature = "fuzztarget"))]
 			historical_inbound_htlc_fulfills: HashSet::new(),
 
-			// We currently only actually support one channel type, and so send there here with no
-			// attempts to retry on error messages. When we support more we'll need fallback
-			// support (assuming we want to support old types).
+			// We currently only actually support one channel type, so don't retry with new types
+			// on error messages. When we support more we'll need fallback support (assuming we
+			// want to support old types).
 			channel_type: ChannelTypeFeatures::known(),
 		})
 	}
@@ -5434,7 +5434,8 @@ impl<'a, Signer: Sign, K: Deref> ReadableArgs<&'a K> for Channel<Signer>
 			(11, channel_type, option),
 		});
 
-		if channel_type.as_ref().unwrap().supports_unknown_bits() || channel_type.as_ref().unwrap().requires_unknown_bits() {
+		let chan_features = channel_type.as_ref().unwrap();
+		if chan_features.supports_unknown_bits() || chan_features.requires_unknown_bits() {
 			// If the channel was written by a new version and negotiated with features we don't
 			// understand yet, refuse to read it.
 			return Err(DecodeError::UnknownRequiredFeature);