f - use ConfirmedUtxo in TestWalletSource

Author: jkczyz

lightning/src/events/bump_transaction/mod.rs

@@ -29,7 +29,7 @@ use crate::ln::chan_utils::{
 	HTLC_TIMEOUT_INPUT_KEYED_ANCHOR_WITNESS_WEIGHT, HTLC_TIMEOUT_INPUT_P2A_ANCHOR_WITNESS_WEIGHT,
 	P2WSH_TXOUT_WEIGHT, SEGWIT_MARKER_FLAG_WEIGHT, TRUC_CHILD_MAX_WEIGHT, TRUC_MAX_WEIGHT,
 };
-use crate::ln::funding::ConfirmedUtxo;
+use crate::ln::funding::FundingTxInput;
 use crate::ln::types::ChannelId;
 use crate::prelude::*;
 use crate::sign::ecdsa::EcdsaChannelSigner;
@@ -340,6 +340,9 @@ impl Utxo {
 	}
 }
 
+/// An unspent transaction output with at least one confirmation.
+pub type ConfirmedUtxo = FundingTxInput;
+
 /// The result of a successful coin selection attempt for a transaction requiring additional UTXOs
 /// to cover its fees.
 #[derive(Clone, Debug)]

lightning/src/ln/functional_test_utils.rs

@@ -395,8 +395,7 @@ fn do_connect_block_without_consistency_checks<'a, 'b, 'c, 'd>(
 		let wallet_script = node.wallet_source.get_change_script().unwrap();
 		for (idx, output) in tx.output.iter().enumerate() {
 			if output.script_pubkey == wallet_script {
-				let outpoint = bitcoin::OutPoint { txid: tx.compute_txid(), vout: idx as u32 };
-				node.wallet_source.add_utxo(outpoint, output.value);
+				node.wallet_source.add_utxo(tx.clone(), idx as u32);
 			}
 		}
 	}

lightning/src/ln/funding.rs

@@ -99,9 +99,10 @@ impl SpliceContribution {
 	}
 }
 
-/// An unspent transaction output with at least one confirmation.
+/// An input to contribute to a channel's funding transaction either when using the v2 channel
+/// establishment protocol or when splicing.
 #[derive(Debug, Clone)]
-pub struct ConfirmedUtxo {
+pub struct FundingTxInput {
 	/// The unspent [`TxOut`] found in [`prevtx`].
 	///
 	/// [`TxOut`]: bitcoin::TxOut
@@ -115,10 +116,6 @@ pub struct ConfirmedUtxo {
 	pub(crate) prevtx: Transaction,
 }
 
-/// An input to contribute to a channel's funding transaction either when using the v2 channel
-/// establishment protocol or when splicing.
-pub type FundingTxInput = ConfirmedUtxo;
-
 impl_writeable_tlv_based!(FundingTxInput, {
 	(1, utxo, required),
 	(3, _sequence, (legacy, Sequence, |input: &FundingTxInput| Some(input.utxo.sequence))),

lightning/src/util/test_utils.rs

@@ -22,7 +22,7 @@ use crate::chain::channelmonitor::{
 use crate::chain::transaction::OutPoint;
 use crate::chain::WatchedOutput;
 use crate::events::bump_transaction::sync::WalletSourceSync;
-use crate::events::bump_transaction::Utxo;
+use crate::events::bump_transaction::{ConfirmedUtxo, Utxo};
 #[cfg(any(test, feature = "_externalize_tests"))]
 use crate::ln::chan_utils::CommitmentTransaction;
 use crate::ln::channel_state::ChannelDetails;
@@ -62,7 +62,6 @@ use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
 use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
 use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};
 
-use bitcoin::absolute::LockTime;
 use bitcoin::amount::Amount;
 use bitcoin::block::Block;
 use bitcoin::constants::genesis_block;
@@ -72,7 +71,7 @@ use bitcoin::hashes::{hex::FromHex, Hash};
 use bitcoin::network::Network;
 use bitcoin::script::{Builder, Script, ScriptBuf};
 use bitcoin::sighash::{EcdsaSighashType, SighashCache};
-use bitcoin::transaction::{Transaction, TxOut, Version};
+use bitcoin::transaction::{Transaction, TxOut};
 use bitcoin::{opcodes, Witness};
 
 use bitcoin::secp256k1::ecdh::SharedSecret;
@@ -2211,7 +2210,7 @@ impl Drop for TestScorer {
 
 pub struct TestWalletSource {
 	secret_key: SecretKey,
-	utxos: Mutex<Vec<Utxo>>,
+	utxos: Mutex<Vec<ConfirmedUtxo>>,
 	secp: Secp256k1<bitcoin::secp256k1::All>,
 }
 
@@ -2220,21 +2219,13 @@ impl TestWalletSource {
 		Self { secret_key, utxos: Mutex::new(Vec::new()), secp: Secp256k1::new() }
 	}
 
-	pub fn add_utxo(&self, outpoint: bitcoin::OutPoint, value: Amount) -> TxOut {
-		let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp));
-		let utxo = Utxo::new_v0_p2wpkh(outpoint, value, &public_key.wpubkey_hash().unwrap());
-		self.utxos.lock().unwrap().push(utxo.clone());
-		utxo.output
-	}
-
-	pub fn add_custom_utxo(&self, utxo: Utxo) -> TxOut {
-		let output = utxo.output.clone();
+	pub fn add_utxo(&self, prevtx: Transaction, vout: u32) {
+		let utxo = ConfirmedUtxo::new_p2wpkh(prevtx, vout).unwrap();
 		self.utxos.lock().unwrap().push(utxo);
-		output
 	}
 
 	pub fn remove_utxo(&self, outpoint: bitcoin::OutPoint) {
-		self.utxos.lock().unwrap().retain(|utxo| utxo.outpoint != outpoint);
+		self.utxos.lock().unwrap().retain(|utxo| utxo.outpoint() != outpoint);
 	}
 
 	pub fn clear_utxos(&self) {
@@ -2246,8 +2237,8 @@ impl TestWalletSource {
 	) -> Result<Transaction, bitcoin::sighash::P2wpkhError> {
 		let utxos = self.utxos.lock().unwrap();
 		for i in 0..tx.input.len() {
-			if let Some(utxo) =
-				utxos.iter().find(|utxo| utxo.outpoint == tx.input[i].previous_output)
+			if let Some(ConfirmedUtxo { utxo, .. }) =
+				utxos.iter().find(|utxo| utxo.outpoint() == tx.input[i].previous_output)
 			{
 				let sighash = SighashCache::new(&tx).p2wpkh_signature_hash(
 					i,
@@ -2277,16 +2268,17 @@ impl TestWalletSource {
 
 impl WalletSourceSync for TestWalletSource {
 	fn list_confirmed_utxos(&self) -> Result<Vec<Utxo>, ()> {
-		Ok(self.utxos.lock().unwrap().clone())
+		Ok(self.utxos.lock().unwrap().iter().map(|ConfirmedUtxo { utxo, .. }| utxo.clone()).collect())
 	}
 
 	fn get_prevtx(&self, utxo: &Utxo) -> Result<Transaction, ()> {
-		Ok(Transaction {
-			version: Version::TWO,
-			lock_time: LockTime::ZERO,
-			input: vec![],
-			output: vec![utxo.output.clone()],
-		})
+		self.utxos
+			.lock()
+			.unwrap()
+			.iter()
+			.find(|confirmed_utxo| confirmed_utxo.utxo == *utxo)
+			.map(|ConfirmedUtxo { prevtx, .. }| prevtx.clone())
+			.ok_or(())
 	}
 
 	fn get_change_script(&self) -> Result<ScriptBuf, ()> {