From 5c77952038711e6f87822b7553e8be2cd34fc357 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 2 Mar 2020 11:44:11 -0500 Subject: [PATCH] Calcualte fees in check_spends!() so taht callsites can use it --- lightning/src/ln/functional_test_utils.rs | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index 66bae1d41..f0fcb9634 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/lightning/src/ln/functional_test_utils.rs @@ -494,14 +494,26 @@ pub fn create_announced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &'a macro_rules! check_spends { ($tx: expr, $($spends_txn: expr),*) => { { - $tx.verify(|out_point| { + let get_output = |out_point: &bitcoin::blockdata::transaction::OutPoint| { $( if out_point.txid == $spends_txn.txid() { return $spends_txn.output.get(out_point.vout as usize).cloned() } )* None - }).unwrap(); + }; + let mut total_value_in = 0; + for input in $tx.input.iter() { + total_value_in += get_output(&input.previous_output).unwrap().value; + } + let mut total_value_out = 0; + for output in $tx.output.iter() { + total_value_out += output.value; + } + //TODO: let min_fee = $tx.get_weight() as u64 / 4; // One sat per vbyte + //TODO: assert!(total_value_out + min_fee <= total_value_in); + $tx.verify(get_output).unwrap(); + total_value_in - total_value_out } } } -- 2.39.5