From b9f321d58616726d92604b00b17c9ffec2fb39e9 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Fri, 27 Nov 2020 20:49:22 +0100 Subject: [PATCH] feeadjuster: misc cleanups in imbalance test Be sure to catch the actual line we want to catch (one per scid), and remove an unused variable. Signed-off-by: Antoine Poinsot --- feeadjuster/test_feeadjuster.py | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/feeadjuster/test_feeadjuster.py b/feeadjuster/test_feeadjuster.py index 8be62d9..484d8ad 100644 --- a/feeadjuster/test_feeadjuster.py +++ b/feeadjuster/test_feeadjuster.py @@ -172,16 +172,20 @@ def test_feeadjuster_imbalance(node_factory): # we force feeadjust initially to test this method and check if it applies # default fees when balancing the channel below l2.rpc.feeadjust() - l2.daemon.wait_for_log("Adjusted fees") - l2.daemon.wait_for_log("Adjusted fees") + l2.daemon.wait_for_logs([ + f"Adjusted fees.*{scid_A}", + f"Adjusted fees.*{scid_B}" + ]) log_offset = len(l2.daemon.logs) wait_for_not_fees(l2, scids, default_fees[0]) # First bring channel to somewhat of a blanance amount = int(chan_total * 0.5) pay(l1, l3, amount) - l2.daemon.wait_for_log('Set default fees as imbalance is too low') - l2.daemon.wait_for_log('Set default fees as imbalance is too low') + l2.daemon.wait_for_logs([ + f'Set default fees as imbalance is too low: {scid_A}', + f'Set default fees as imbalance is too low: {scid_B}' + ]) wait_for_fees(l2, scids, default_fees[0]) # Because of the 70/30 imbalance limiter, a 15% payment must not yet trigger @@ -192,12 +196,16 @@ def test_feeadjuster_imbalance(node_factory): # Sending another 20% must now trigger because the imbalance pay(l1, l3, amount) - l2.daemon.wait_for_log("Adjusted fees") - l2.daemon.wait_for_log("Adjusted fees") + l2.daemon.wait_for_logs([ + f"Adjusted fees.*{scid_A}", + f"Adjusted fees.*{scid_B}" + ]) wait_for_not_fees(l2, scids, default_fees[0]) # Bringing it back must cause default fees pay(l3, l1, amount) - l2.daemon.wait_for_log('Set default fees as imbalance is too low') - l2.daemon.wait_for_log('Set default fees as imbalance is too low') + l2.daemon.wait_for_logs([ + f'Set default fees as imbalance is too low: {scid_A}', + f'Set default fees as imbalance is too low: {scid_B}' + ]) wait_for_fees(l2, scids, default_fees[0])