From 679932e0aa5d4810a52ce1afd92c08818d7152d1 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 16 Mar 2020 23:14:00 -0400 Subject: [PATCH] Revert "Test that txn pay at least a minimum relay fee in functional tests" This reverts commit cc038cc28796d04335f9705858cdfb74ee6f0d72. --- lightning/src/ln/functional_test_utils.rs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index d21dc792..a8c4d279 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/lightning/src/ln/functional_test_utils.rs @@ -475,25 +475,14 @@ pub fn create_announced_chan_between_nodes_with_value<'a, 'b, 'c, 'd>(nodes: &'a macro_rules! check_spends { ($tx: expr, $($spends_txn: expr),*) => { { - let get_output = |out_point: &bitcoin::blockdata::transaction::OutPoint| { + $tx.verify(|out_point| { $( if out_point.txid == $spends_txn.txid() { return $spends_txn.output.get(out_point.vout as usize).cloned() } )* None - }; - 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; - } - let min_fee = $tx.get_weight() as u64 / 4; // One sat per vbyte - assert!(total_value_out + min_fee <= total_value_in); // Must not be equal as there must be a fee! - $tx.verify(get_output).unwrap(); + }).unwrap(); } } } -- 2.30.2