fix Improve readability, minor simplification, typos

Author: optout21

lightning/src/ln/channel.rs

@@ -2243,26 +2243,27 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 		// Note: For the error case when the inputs are insufficient, it will be handled after
 		// the `calculate_change_output_value` call below
 		let mut funding_outputs = Vec::new();
-		let funding_output_value_satoshis = self.funding.get_value_satoshis();
-		let funding_output_script_pubkey = self.funding.get_funding_redeemscript().to_p2wsh();
-		let expected_remote_shared_funding_output = if self.funding.is_outbound() {
-			let tx_out = TxOut {
-				value: Amount::from_sat(funding_output_value_satoshis),
-				script_pubkey: funding_output_script_pubkey,
-			};
-			funding_outputs.push(
-				if self.dual_funding_context.their_funding_satoshis.unwrap_or(0) == 0 {
-					OutputOwned::SharedControlFullyOwned(tx_out)
-				} else {
+		let mut expected_remote_shared_funding_output = None;
+
+		let shared_funding_output = TxOut {
+			value: Amount::from_sat(self.funding.get_value_satoshis()),
+			script_pubkey: self.funding.get_funding_redeemscript().to_p2wsh(),
+		};
+
+		if self.funding.is_outbound() {
+			if self.dual_funding_context.their_funding_satoshis.unwrap_or(0) == 0 {
+				funding_outputs.push(OutputOwned::SharedControlFullyOwned(shared_funding_output));
+			} else {
+				funding_outputs.push(
 					OutputOwned::Shared(SharedOwnedOutput::new(
-						tx_out, self.dual_funding_context.our_funding_satoshis
+						shared_funding_output, self.dual_funding_context.our_funding_satoshis,
 					))
-				}
-			);
-			None
+				);
+			}
 		} else {
-			Some((funding_output_script_pubkey, funding_output_value_satoshis))
-		};
+			let TxOut { value, script_pubkey } = shared_funding_output;
+			expected_remote_shared_funding_output = Some((script_pubkey, value.to_sat()));
+		}
 
 		// Optionally add change output
 		let change_script = if let Some(script) = change_destination_opt {

lightning/src/ln/interactivetxs.rs

@@ -1680,9 +1680,9 @@ impl InteractiveTxConstructor {
 /// Three outcomes are possible:
 /// - Inputs are sufficient for intended contribution, fees, and a larger-than-dust change:
 ///   `Ok(Some(change_amount))`
-/// - Inputs are sufficient for intended contribution and fees, but not for a change:
+/// - Inputs are sufficient for intended contribution and fees, and a change output isn't needed:
 ///   `Ok(None)`
-/// - Insputs are not sufficent to cover contribution and fees:
+/// - Inputs are not sufficent to cover contribution and fees:
 ///   `Err(AbortReason::InsufficientFees)`
 #[allow(dead_code)] // TODO(dual_funding): Remove once begin_interactive_funding_tx_construction() is used
 pub(super) fn calculate_change_output_value(
@@ -2672,11 +2672,10 @@ mod tests {
 
 	#[test]
 	fn test_calculate_change_output_value_open() {
-		let input_prevouts_owned = vec![
+		let input_prevouts = vec![
 			TxOut { value: Amount::from_sat(70_000), script_pubkey: ScriptBuf::new() },
 			TxOut { value: Amount::from_sat(60_000), script_pubkey: ScriptBuf::new() },
 		];
-		let input_prevouts: Vec<&TxOut> = input_prevouts_owned.iter().collect();
 		let inputs = input_prevouts
 			.iter()
 			.map(|txout| {