f remove BlindedPamentTlvs::Receive::features

Author: valentinewallace

lightning/src/blinded_path/payment.rs

@@ -37,11 +37,6 @@ pub enum BlindedPaymentTlvs {
 		payment_secret: PaymentSecret,
 		/// Constraints for the receiver of this payment.
 		payment_constraints: PaymentConstraints,
-		/// Supported and required features when receiving a payment containing this object's
-		/// corresponding [`BlindedHop`].
-		///
-		/// [`BlindedHop`]: crate::blinded_path::BlindedHop
-		features: BlindedHopFeatures,
 	},
 }
 
@@ -89,11 +84,10 @@ impl Writeable for BlindedPaymentTlvs {
 					(14, features, required),
 				});
 			},
-			Self::Receive { payment_secret, payment_constraints, features } => {
+			Self::Receive { payment_secret, payment_constraints } => {
 				encode_tlv_stream!(w, {
 					(6, payment_secret, required),
 					(12, payment_constraints, required),
-					(14, features, required),
 				});
 			}
 		}
@@ -109,22 +103,21 @@ impl Readable for BlindedPaymentTlvs {
 			(6, payment_secret, option),
 			(10, payment_relay, option),
 			(12, payment_constraints, required),
-			(14, features, required),
+			(14, features, option),
 		});
 		if let Some(short_channel_id) = scid {
 			if payment_secret.is_some() { return Err(DecodeError::InvalidValue) }
 			Ok(BlindedPaymentTlvs::Forward {
 				short_channel_id,
 				payment_relay: payment_relay.ok_or(DecodeError::InvalidValue)?,
 				payment_constraints: payment_constraints.0.unwrap(),
-				features: features.0.unwrap(),
+				features: features.ok_or(DecodeError::InvalidValue)?,
 			})
 		} else {
-			if payment_relay.is_some() { return Err(DecodeError::InvalidValue) }
+			if payment_relay.is_some() | features.is_some() { return Err(DecodeError::InvalidValue) }
 			Ok(BlindedPaymentTlvs::Receive {
 				payment_secret: payment_secret.ok_or(DecodeError::InvalidValue)?,
 				payment_constraints: payment_constraints.0.unwrap(),
-				features: features.0.unwrap(),
 			})
 		}
 	}