From 437c411769b393a79eb3ce6d244309f38ffdb7a8 Mon Sep 17 00:00:00 2001 From: Christian Decker Date: Tue, 25 Aug 2020 18:51:25 +0200 Subject: [PATCH] pyln-testing: Have LightningNode.fund_channel poll --- contrib/pyln-testing/pyln/testing/utils.py | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py index b73891be6..0b08e2d13 100644 --- a/contrib/pyln-testing/pyln/testing/utils.py +++ b/contrib/pyln-testing/pyln/testing/utils.py @@ -759,18 +759,9 @@ class LightningNode(object): get_tx_p2wsh_outnum(self.bitcoin, tx, amount)) if wait_for_active: - # We wait until gossipd sees both local updates, as well as status NORMAL, - # so it can definitely route through. - self.daemon.wait_for_logs([r'update for channel {}/0 now ACTIVE' - .format(scid), - r'update for channel {}/1 now ACTIVE' - .format(scid), - 'to CHANNELD_NORMAL']) - l2.daemon.wait_for_logs([r'update for channel {}/0 now ACTIVE' - .format(scid), - r'update for channel {}/1 now ACTIVE' - .format(scid), - 'to CHANNELD_NORMAL']) + self.wait_channel_active(scid) + l2.wait_channel_active(scid) + return scid def subd_pid(self, subd, peerid=None):