f - remove expect

Author: jkczyz

lightning/src/sign/mod.rs

@@ -1206,12 +1206,12 @@ impl InMemorySigner {
 			return Err(());
 		}
 
-		// TODO: Is this ok?
-		let channel_parameters =
-			descriptor.channel_transaction_parameters.as_ref().expect(MISSING_PARAMS_ERR);
-		let remotepubkey = bitcoin::PublicKey::new(channel_parameters.holder_pubkeys.payment_point);
-		let supports_anchors_zero_fee_htlc_tx =
-			channel_parameters.channel_type_features.supports_anchors_zero_fee_htlc_tx();
+		let remotepubkey = bitcoin::PublicKey::new(self.pubkeys().payment_point);
+		let supports_anchors_zero_fee_htlc_tx = descriptor
+			.channel_transaction_parameters
+			.as_ref()
+			.map(|params| params.channel_type_features.supports_anchors_zero_fee_htlc_tx())
+			.unwrap_or(false);
 
 		let witness_script = if supports_anchors_zero_fee_htlc_tx {
 			chan_utils::get_to_countersignatory_with_anchors_redeemscript(&remotepubkey.inner)