From 15e6f6105244578479498b591d09c276506cb2f5 Mon Sep 17 00:00:00 2001
From: Michael Schmoock <michael@schmoock.net>
Date: Wed, 14 Sep 2022 15:07:15 +0200
Subject: [PATCH] drain: use fundchannel instead of openchannel

Affects: tests

Using openchannel does not always guarantee a channel to have a SCID.
Thus `node.get_channel_scid(...)` can raise an error when a channel
was opened using openchannel.
---
 drain/test_drain.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drain/test_drain.py b/drain/test_drain.py
index 865fb8a..90460df 100644
--- a/drain/test_drain.py
+++ b/drain/test_drain.py
@@ -44,7 +44,7 @@ def test_drain_and_refill(node_factory, bitcoind):
     scid12 = l1.get_channel_scid(l2)
     scid23 = l2.get_channel_scid(l3)
     scid34 = l3.get_channel_scid(l4)
-    l4.openchannel(l1, 10**6)
+    l4.fundchannel(l1, 10**6)
     scid41 = l4.get_channel_scid(l1)
 
     # disable fees to make circular line graph tests a lot easier
@@ -97,7 +97,7 @@ def test_fill_and_drain(node_factory, bitcoind):
     scid12 = l1.get_channel_scid(l2)
     scid23 = l2.get_channel_scid(l3)
     scid34 = l3.get_channel_scid(l4)
-    l4.openchannel(l1, 10**6)
+    l4.fundchannel(l1, 10**6)
     scid41 = l4.get_channel_scid(l1)
 
     # disable fees to make circular line graph tests a lot easier
@@ -145,7 +145,7 @@ def test_setbalance(node_factory, bitcoind):
     scid12 = l1.get_channel_scid(l2)
     scid23 = l2.get_channel_scid(l3)
     scid34 = l3.get_channel_scid(l4)
-    l4.openchannel(l1, 10**6)
+    l4.fundchannel(l1, 10**6)
     scid41 = l4.get_channel_scid(l1)
 
     # wait for each others gossip
@@ -217,11 +217,11 @@ def test_drain_chunks(node_factory, bitcoind):
     l2.connect(l4)
     l3.connect(l4)
     l4.connect(l1)
-    l1.openchannel(l2, 10**6)
-    l1.openchannel(l3, 10**6)
-    l2.openchannel(l4, 10**6)
-    l3.openchannel(l4, 10**6)
-    l4.openchannel(l1, 11**6)
+    l1.fundchannel(l2, 10**6)
+    l1.fundchannel(l3, 10**6)
+    l2.fundchannel(l4, 10**6)
+    l3.fundchannel(l4, 10**6)
+    l4.fundchannel(l1, 11**6)
     scid12 = l1.get_channel_scid(l2)
     scid13 = l1.get_channel_scid(l3)
     scid24 = l2.get_channel_scid(l4)
@@ -300,11 +300,11 @@ def test_fill_chunks(node_factory, bitcoind):
     l2.connect(l4)
     l3.connect(l4)
     l4.connect(l1)
-    l1.openchannel(l2, 10**6)
-    l1.openchannel(l3, 10**6)
-    l2.openchannel(l4, 10**6)
-    l3.openchannel(l4, 10**6)
-    l4.openchannel(l1, 11**6)
+    l1.fundchannel(l2, 10**6)
+    l1.fundchannel(l3, 10**6)
+    l2.fundchannel(l4, 10**6)
+    l3.fundchannel(l4, 10**6)
+    l4.fundchannel(l1, 11**6)
     scid12 = l1.get_channel_scid(l2)
     scid13 = l1.get_channel_scid(l3)
     scid24 = l2.get_channel_scid(l4)