X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=531c2dad0f3207843079c097bbe51687e5c82098;hb=5a6f9b00285ea39cfcbb88b62283710c68df13dc;hp=a34cb0cf323a337edc757579c761d1363948212b;hpb=2d4bf974e5b588ce93cc8f1e133cda30ca1d91ee;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index a34cb0cf..531c2dad 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -25,7 +25,7 @@ use crate::ln::msgs::LightningError;
 use crate::ln::script::ShutdownScript;
 use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId};
 use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult};
-use crate::routing::router::{find_route, InFlightHtlcs, Route, RouteHop, RouteParameters, Router, ScorerAccountingForInFlightHtlcs};
+use crate::routing::router::{find_route, InFlightHtlcs, Path, Route, RouteParameters, Router, ScorerAccountingForInFlightHtlcs};
 use crate::routing::scoring::{ChannelUsage, Score};
 use crate::util::config::UserConfig;
 use crate::util::enforcing_trait_impls::{EnforcingSigner, EnforcementState};
@@ -60,6 +60,15 @@ use crate::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, Node
 use std::time::{SystemTime, UNIX_EPOCH};
 use bitcoin::Sequence;
 
+pub fn pubkey(byte: u8) -> PublicKey {
+	let secp_ctx = Secp256k1::new();
+	PublicKey::from_secret_key(&secp_ctx, &privkey(byte))
+}
+
+pub fn privkey(byte: u8) -> SecretKey {
+	SecretKey::from_slice(&[byte; 32]).unwrap()
+}
+
 pub struct TestVecWriter(pub Vec<u8>);
 impl Writer for TestVecWriter {
 	fn write_all(&mut self, buf: &[u8]) -> Result<(), io::Error> {
@@ -106,7 +115,7 @@ impl<'a> Router for TestRouter<'a> {
 				let scorer = ScorerAccountingForInFlightHtlcs::new(locked_scorer, inflight_htlcs);
 				for path in &route.paths {
 					let mut aggregate_msat = 0u64;
-					for (idx, hop) in path.iter().rev().enumerate() {
+					for (idx, hop) in path.hops.iter().rev().enumerate() {
 						aggregate_msat += hop.fee_msat;
 						let usage = ChannelUsage {
 							amount_msat: aggregate_msat,
@@ -116,11 +125,11 @@ impl<'a> Router for TestRouter<'a> {
 
 						// Since the path is reversed, the last element in our iteration is the first
 						// hop.
-						if idx == path.len() - 1 {
+						if idx == path.hops.len() - 1 {
 							scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(payer), &NodeId::from_pubkey(&hop.pubkey), usage);
 						} else {
-							let curr_hop_path_idx = path.len() - 1 - idx;
-							scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(&path[curr_hop_path_idx - 1].pubkey), &NodeId::from_pubkey(&hop.pubkey), usage);
+							let curr_hop_path_idx = path.hops.len() - 1 - idx;
+							scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(&path.hops[curr_hop_path_idx - 1].pubkey), &NodeId::from_pubkey(&hop.pubkey), usage);
 						}
 					}
 				}
@@ -311,6 +320,17 @@ impl TestBroadcaster {
 	pub fn new(blocks: Arc<Mutex<Vec<(Block, u32)>>>) -> TestBroadcaster {
 		TestBroadcaster { txn_broadcasted: Mutex::new(Vec::new()), blocks }
 	}
+
+	pub fn txn_broadcast(&self) -> Vec<Transaction> {
+		self.txn_broadcasted.lock().unwrap().split_off(0)
+	}
+
+	pub fn unique_txn_broadcast(&self) -> Vec<Transaction> {
+		let mut txn = self.txn_broadcasted.lock().unwrap().split_off(0);
+		let mut seen = HashSet::new();
+		txn.retain(|tx| seen.insert(tx.txid()));
+		txn
+	}
 }
 
 impl chaininterface::BroadcasterInterface for TestBroadcaster {
@@ -956,13 +976,13 @@ impl Score for TestScorer {
 		0
 	}
 
-	fn payment_path_failed(&mut self, _actual_path: &[&RouteHop], _actual_short_channel_id: u64) {}
+	fn payment_path_failed(&mut self, _actual_path: &Path, _actual_short_channel_id: u64) {}
 
-	fn payment_path_successful(&mut self, _actual_path: &[&RouteHop]) {}
+	fn payment_path_successful(&mut self, _actual_path: &Path) {}
 
-	fn probe_failed(&mut self, _actual_path: &[&RouteHop], _: u64) {}
+	fn probe_failed(&mut self, _actual_path: &Path, _: u64) {}
 
-	fn probe_successful(&mut self, _actual_path: &[&RouteHop]) {}
+	fn probe_successful(&mut self, _actual_path: &Path) {}
 }
 
 impl Drop for TestScorer {