f - clean-up and rustfmt

Author: jkczyz

lightning/src/events/bump_transaction/mod.rs

@@ -876,15 +876,15 @@ where
 			// add witness_utxo to anchor input
 			anchor_psbt.inputs[0].witness_utxo = Some(anchor_descriptor.previous_utxo());
 			// add witness_utxo to remaining inputs
-			for (idx, ConfirmedUtxo { utxo, .. }) in coin_selection.confirmed_utxos.into_iter().enumerate() {
+			for (idx, utxo) in coin_selection.confirmed_utxos.into_iter().enumerate() {
 				// add 1 to skip the anchor input
 				let index = idx + 1;
 				debug_assert_eq!(
 					anchor_psbt.unsigned_tx.input[index].previous_output,
-					utxo.outpoint
+					utxo.outpoint()
 				);
-				if utxo.output.script_pubkey.is_witness_program() {
-					anchor_psbt.inputs[index].witness_utxo = Some(utxo.output);
+				if utxo.output().script_pubkey.is_witness_program() {
+					anchor_psbt.inputs[index].witness_utxo = Some(utxo.into_output());
 				}
 			}
 
@@ -1138,12 +1138,15 @@ where
 			}
 
 			// add witness_utxo to remaining inputs
-			for (idx, ConfirmedUtxo { utxo, .. }) in coin_selection.confirmed_utxos.into_iter().enumerate() {
+			for (idx, utxo) in coin_selection.confirmed_utxos.into_iter().enumerate() {
 				// offset to skip the htlc inputs
 				let index = idx + selected_htlcs.len();
-				debug_assert_eq!(htlc_psbt.unsigned_tx.input[index].previous_output, utxo.outpoint);
-				if utxo.output.script_pubkey.is_witness_program() {
-					htlc_psbt.inputs[index].witness_utxo = Some(utxo.output);
+				debug_assert_eq!(
+					htlc_psbt.unsigned_tx.input[index].previous_output,
+					utxo.outpoint()
+				);
+				if utxo.output().script_pubkey.is_witness_program() {
+					htlc_psbt.inputs[index].witness_utxo = Some(utxo.into_output());
 				}
 			}
 
@@ -1353,10 +1356,7 @@ mod tests {
 			version: Version::TWO,
 			lock_time: LockTime::ZERO,
 			input: vec![],
-			output: vec![TxOut {
-				value: Amount::from_sat(200),
-				script_pubkey: ScriptBuf::new()
-			}],
+			output: vec![TxOut { value: Amount::from_sat(200), script_pubkey: ScriptBuf::new() }],
 		};
 
 		let broadcaster = TestBroadcaster::new(Network::Testnet);

lightning/src/ln/funding.rs

@@ -226,6 +226,11 @@ impl FundingTxInput {
 		self.utxo.outpoint
 	}
 
+	/// The unspent output.
+	pub fn output(&self) -> &TxOut {
+		&self.utxo.output
+	}
+
 	/// The sequence number to use in the [`TxIn`].
 	///
 	/// [`TxIn`]: bitcoin::TxIn
@@ -240,8 +245,13 @@ impl FundingTxInput {
 		self.utxo.sequence = sequence;
 	}
 
-	/// Converts the [`FundingTxInput`] into a [`Utxo`] for coin selection.
+	/// Converts the [`FundingTxInput`] into a [`Utxo`].
 	pub fn into_utxo(self) -> Utxo {
 		self.utxo
 	}
+
+	/// Converts the [`FundingTxInput`] into a [`TxOut`].
+	pub fn into_output(self) -> TxOut {
+		self.utxo.output
+	}
 }

lightning/src/util/test_utils.rs

@@ -2237,13 +2237,13 @@ impl TestWalletSource {
 	) -> Result<Transaction, bitcoin::sighash::P2wpkhError> {
 		let utxos = self.utxos.lock().unwrap();
 		for i in 0..tx.input.len() {
-			if let Some(ConfirmedUtxo { utxo, .. }) =
+			if let Some(utxo) =
 				utxos.iter().find(|utxo| utxo.outpoint() == tx.input[i].previous_output)
 			{
 				let sighash = SighashCache::new(&tx).p2wpkh_signature_hash(
 					i,
-					&utxo.output.script_pubkey,
-					utxo.output.value,
+					&utxo.output().script_pubkey,
+					utxo.output().value,
 					EcdsaSighashType::All,
 				)?;
 				#[cfg(not(feature = "grind_signatures"))]
@@ -2268,7 +2268,13 @@ impl TestWalletSource {
 
 impl WalletSourceSync for TestWalletSource {
 	fn list_confirmed_utxos(&self) -> Result<Vec<Utxo>, ()> {
-		Ok(self.utxos.lock().unwrap().iter().map(|ConfirmedUtxo { utxo, .. }| utxo.clone()).collect())
+		Ok(self
+			.utxos
+			.lock()
+			.unwrap()
+			.iter()
+			.map(|ConfirmedUtxo { utxo, .. }| utxo.clone())
+			.collect())
 	}
 
 	fn get_prevtx(&self, utxo: &Utxo) -> Result<Transaction, ()> {