f - move weight calculation

Author: jkczyz

lightning/src/ln/interactivetxs.rs

@@ -1909,14 +1909,9 @@ pub(super) fn calculate_change_output_value(
 		let weight = estimate_input_weight(output).to_wu();
 		our_funding_inputs_weight = our_funding_inputs_weight.saturating_add(weight);
 	}
-	// If there is a shared input, account for it,
-	// and for the initiator also consider the fee
+
 	if let Some(shared_input) = shared_input {
 		total_input_satoshis = total_input_satoshis.saturating_add(shared_input);
-		if is_initiator {
-			our_funding_inputs_weight =
-				our_funding_inputs_weight.saturating_add(FUNDING_TRANSACTION_WITNESS_WEIGHT);
-		}
 	}
 
 	let our_funding_outputs_weight = funding_outputs.iter().fold(0u64, |weight, out| {
@@ -1929,6 +1924,10 @@ pub(super) fn calculate_change_output_value(
 	if is_initiator {
 		weight = weight.saturating_add(get_output_weight(shared_output_funding_script).to_wu());
 		weight = weight.saturating_add(TX_COMMON_FIELDS_WEIGHT);
+
+		if shared_input.is_some() {
+			weight = weight.saturating_add(FUNDING_TRANSACTION_WITNESS_WEIGHT);
+		}
 	}
 
 	let fees_sats = fee_for_weight(funding_feerate_sat_per_1000_weight, weight);