]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Revert "Test that txn pay at least a minimum relay fee in functional tests"
authorMatt Corallo <git@bluematt.me>
Tue, 17 Mar 2020 03:14:00 +0000 (23:14 -0400)
committerMatt Corallo <git@bluematt.me>
Mon, 25 May 2020 19:36:58 +0000 (15:36 -0400)
This reverts commit cc038cc28796d04335f9705858cdfb74ee6f0d72.

lightning/src/ln/functional_test_utils.rs

index d21dc792185b0eeb2f1899b3e35fb95e3b98476c..a8c4d279763950e8dda2b5d326c7587c4e089214 100644 (file)
@@ -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();
                }
        }
 }