X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fln%2Ffunctional_test_utils.rs;h=3c84cff5b1a418e13c1896d888361fd742d81e2e;hb=39b562e0092007ea67fa32b5b47090c988086248;hp=fe32a1ef24bf9f5d239044e446eab284f1295bae;hpb=127ce296a713c9556623f093326f3b8645d4d5c3;p=rust-lightning diff --git a/src/ln/functional_test_utils.rs b/src/ln/functional_test_utils.rs index fe32a1ef..3c84cff5 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, 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(); } } }