X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Ffunctional_test_utils.rs;h=ba30330719e1fd0bd7a2ad66f943b7b7d44f3b00;hb=148c79719e9177709c7b546d2636e3fa28046fc9;hp=fe32a1ef24bf9f5d239044e446eab284f1295bae;hpb=56f16eaa4df0de13a59f6524562a8d8a45b6c2ea;p=rust-lightning

diff --git a/src/ln/functional_test_utils.rs b/src/ln/functional_test_utils.rs
index fe32a1ef..ba303307 100644
--- a/src/ln/functional_test_utils.rs
+++ b/src/ln/functional_test_utils.rs
@@ -29,8 +29,6 @@ use secp256k1::key::PublicKey;
 use rand::{thread_rng,Rng};
 
 use std::cell::RefCell;
-use std::collections::HashMap;
-use std::default::Default;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};
 use std::mem;
@@ -307,10 +305,13 @@ pub fn create_announced_chan_between_nodes_with_value(nodes: &Vec<Node>, a: usiz
 macro_rules! check_spends {
 	($tx: expr, $spends_tx: expr) => {
 		{
-			let mut funding_tx_map = HashMap::new();
-			let spends_tx = $spends_tx;
-			funding_tx_map.insert(spends_tx.txid(), spends_tx);
-			$tx.verify(&funding_tx_map).unwrap();
+			$tx.verify(|out_point| {
+				if out_point.txid == $spends_tx.txid() {
+					$spends_tx.output.get(out_point.vout as usize).cloned()
+				} else {
+					None
+				}
+			}).unwrap();
 		}
 	}
 }
@@ -843,7 +844,7 @@ pub fn create_network(node_count: usize, node_config: &[Option<UserConfig>]) ->
 		let mut default_config = UserConfig::new();
 		default_config.channel_options.announced_channel = true;
 		default_config.peer_channel_config_limits.force_announced_channel_preference = false;
-		let node = ChannelManager::new(Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger), keys_manager.clone(), if node_config[i].is_some() { node_config[i].clone().unwrap() } else { default_config }).unwrap();
+		let node = ChannelManager::new(Network::Testnet, feeest.clone(), chan_monitor.clone(), chain_monitor.clone(), tx_broadcaster.clone(), Arc::clone(&logger), keys_manager.clone(), if node_config[i].is_some() { node_config[i].clone().unwrap() } else { default_config }, 0).unwrap();
 		let router = Router::new(PublicKey::from_secret_key(&secp_ctx, &keys_manager.get_node_secret()), chain_monitor.clone(), Arc::clone(&logger));
 		nodes.push(Node { chain_monitor, tx_broadcaster, chan_monitor, node, router, keys_manager, node_seed: seed,
 			network_payment_count: payment_count.clone(),