X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=65c0483a59c9906e36b4a42587698362bd77702c;hb=d4ad826c6eb85ea91ec7aa2cd4545fa2139a4462;hp=24979036ee3ceb7ecb2fa24af1586ba2adaa35e8;hpb=397386539d19ea368d1f37566b6b0640b90c9668;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index 24979036..65c0483a 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -18,6 +18,7 @@ use crate::chain::channelmonitor::MonitorEvent;
 use crate::chain::transaction::OutPoint;
 use crate::sign;
 use crate::events;
+use crate::events::bump_transaction::{WalletSource, Utxo};
 use crate::ln::channelmanager;
 use crate::ln::features::{ChannelFeatures, InitFeatures, NodeFeatures};
 use crate::ln::{msgs, wire};
@@ -32,6 +33,7 @@ use crate::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
 use crate::util::logger::{Logger, Level, Record};
 use crate::util::ser::{Readable, ReadableArgs, Writer, Writeable};
 
+use bitcoin::EcdsaSighashType;
 use bitcoin::blockdata::constants::ChainHash;
 use bitcoin::blockdata::constants::genesis_block;
 use bitcoin::blockdata::transaction::{Transaction, TxOut};
@@ -40,6 +42,7 @@ use bitcoin::blockdata::opcodes;
 use bitcoin::blockdata::block::Block;
 use bitcoin::network::constants::Network;
 use bitcoin::hash_types::{BlockHash, Txid};
+use bitcoin::util::sighash::SighashCache;
 
 use bitcoin::secp256k1::{SecretKey, PublicKey, Secp256k1, ecdsa::Signature, Scalar};
 use bitcoin::secp256k1::ecdh::SharedSecret;
@@ -51,6 +54,7 @@ use regex;
 use crate::io;
 use crate::prelude::*;
 use core::cell::RefCell;
+use core::ops::DerefMut;
 use core::time::Duration;
 use crate::sync::{Mutex, Arc};
 use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
@@ -108,13 +112,13 @@ impl<'a> TestRouter<'a> {
 impl<'a> Router for TestRouter<'a> {
 	fn find_route(
 		&self, payer: &PublicKey, params: &RouteParameters, first_hops: Option<&[&channelmanager::ChannelDetails]>,
-		inflight_htlcs: &InFlightHtlcs
+		inflight_htlcs: InFlightHtlcs
 	) -> Result<Route, msgs::LightningError> {
 		if let Some((find_route_query, find_route_res)) = self.next_routes.lock().unwrap().pop_front() {
 			assert_eq!(find_route_query, *params);
 			if let Ok(ref route) = find_route_res {
-				let locked_scorer = self.scorer.lock().unwrap();
-				let scorer = ScorerAccountingForInFlightHtlcs::new(locked_scorer, inflight_htlcs);
+				let mut binding = self.scorer.lock().unwrap();
+				let scorer = ScorerAccountingForInFlightHtlcs::new(binding.deref_mut(), &inflight_htlcs);
 				for path in &route.paths {
 					let mut aggregate_msat = 0u64;
 					for (idx, hop) in path.hops.iter().rev().enumerate() {
@@ -139,10 +143,9 @@ impl<'a> Router for TestRouter<'a> {
 			return find_route_res;
 		}
 		let logger = TestLogger::new();
-		let scorer = self.scorer.lock().unwrap();
 		find_route(
 			payer, params, &self.network_graph, first_hops, &logger,
-			&ScorerAccountingForInFlightHtlcs::new(scorer, &inflight_htlcs), &(),
+			&ScorerAccountingForInFlightHtlcs::new(self.scorer.lock().unwrap().deref_mut(), &inflight_htlcs), &(),
 			&[42; 32]
 		)
 	}
@@ -1067,3 +1070,65 @@ impl Drop for TestScorer {
 		}
 	}
 }
+
+pub struct TestWalletSource {
+	secret_key: SecretKey,
+	utxos: RefCell<Vec<Utxo>>,
+	secp: Secp256k1<bitcoin::secp256k1::All>,
+}
+
+impl TestWalletSource {
+	pub fn new(secret_key: SecretKey) -> Self {
+		Self {
+			secret_key,
+			utxos: RefCell::new(Vec::new()),
+			secp: Secp256k1::new(),
+		}
+	}
+
+	pub fn add_utxo(&self, outpoint: bitcoin::OutPoint, value: u64) -> TxOut {
+		let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp));
+		let utxo = Utxo::new_p2pkh(outpoint, value, &public_key.pubkey_hash());
+		self.utxos.borrow_mut().push(utxo.clone());
+		utxo.output
+	}
+
+	pub fn add_custom_utxo(&self, utxo: Utxo) -> TxOut {
+		let output = utxo.output.clone();
+		self.utxos.borrow_mut().push(utxo);
+		output
+	}
+
+	pub fn remove_utxo(&self, outpoint: bitcoin::OutPoint) {
+		self.utxos.borrow_mut().retain(|utxo| utxo.outpoint != outpoint);
+	}
+}
+
+impl WalletSource for TestWalletSource {
+	fn list_confirmed_utxos(&self) -> Result<Vec<Utxo>, ()> {
+		Ok(self.utxos.borrow().clone())
+	}
+
+	fn get_change_script(&self) -> Result<Script, ()> {
+		let public_key = bitcoin::PublicKey::new(self.secret_key.public_key(&self.secp));
+		Ok(Script::new_p2pkh(&public_key.pubkey_hash()))
+	}
+
+	fn sign_tx(&self, mut tx: Transaction) -> Result<Transaction, ()> {
+		let utxos = self.utxos.borrow();
+		for i in 0..tx.input.len() {
+			if let Some(utxo) = utxos.iter().find(|utxo| utxo.outpoint == tx.input[i].previous_output) {
+				let sighash = SighashCache::new(&tx)
+					.legacy_signature_hash(i, &utxo.output.script_pubkey, EcdsaSighashType::All as u32)
+					.map_err(|_| ())?;
+				let sig = self.secp.sign_ecdsa(&sighash.as_hash().into(), &self.secret_key);
+				let bitcoin_sig = bitcoin::EcdsaSig { sig, hash_ty: EcdsaSighashType::All }.to_vec();
+				tx.input[i].script_sig = Builder::new()
+					.push_slice(&bitcoin_sig)
+					.push_slice(&self.secret_key.public_key(&self.secp).serialize())
+					.into_script();
+			}
+		}
+		Ok(tx)
+	}
+}