mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

pytest: new join_nodes to allow you to get all the nodes then join some of them.

Browse source 
This lets you get_nodes() and join some later.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-08-05 03:59:51 +09:30 • committed by Christian Decker
parent 64d40414b2
commit 8f455c8b98
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
contrib/pyln-testing/pyln/testing/utils.py
View file

@ -1072,13 +1072,10 @@ class NodeFactory(object):
raise raise
return node return node
def line_graph(self, num_nodes, fundchannel=True, fundamount=10**6, wait_for_announce=False, opts=None, announce_channels=True): def join_nodes(self, nodes, fundchannel=True, fundamount=10**6, wait_for_announce=False, announce_channels=True) -> None:
""" Create nodes, connect them and optionally fund channels. """Given nodes, connect them in a line, optionally funding a channel"""
"""
assert not (wait_for_announce and not announce_channels), "You've asked to wait for an announcement that's not coming. (wait_for_announce=True,announce_channels=False)" assert not (wait_for_announce and not announce_channels), "You've asked to wait for an announcement that's not coming. (wait_for_announce=True,announce_channels=False)"
nodes = self.get_nodes(num_nodes, opts=opts) connections = [(nodes[i], nodes[i + 1]) for i in range(len(nodes) - 1)]
bitcoin = nodes[0].bitcoin
connections = [(nodes[i], nodes[i + 1]) for i in range(0, num_nodes - 1)]
for src, dst in connections: for src, dst in connections:
src.rpc.connect(dst.info['id'], 'localhost', dst.port) src.rpc.connect(dst.info['id'], 'localhost', dst.port)
@ -1088,21 +1085,22 @@ class NodeFactory(object):
if not fundchannel: if not fundchannel:
for src, dst in connections: for src, dst in connections:
dst.daemon.wait_for_log(r'{}-.*openingd-chan#[0-9]*: Handed peer, entering loop'.format(src.info['id'])) dst.daemon.wait_for_log(r'{}-.*openingd-chan#[0-9]*: Handed peer, entering loop'.format(src.info['id']))
return nodes return
bitcoind = nodes[0].bitcoin
# If we got here, we want to fund channels # If we got here, we want to fund channels
for src, dst in connections: for src, dst in connections:
addr = src.rpc.newaddr()['bech32'] addr = src.rpc.newaddr()['bech32']
src.bitcoin.rpc.sendtoaddress(addr, (fundamount + 1000000) / 10**8) bitcoind.rpc.sendtoaddress(addr, (fundamount + 1000000) / 10**8)
bitcoin.generate_block(1) bitcoind.generate_block(1)
for src, dst in connections: for src, dst in connections:
wait_for(lambda: len(src.rpc.listfunds()['outputs']) > 0) wait_for(lambda: len(src.rpc.listfunds()['outputs']) > 0)
tx = src.rpc.fundchannel(dst.info['id'], fundamount, announce=announce_channels) tx = src.rpc.fundchannel(dst.info['id'], fundamount, announce=announce_channels)
wait_for(lambda: tx['txid'] in bitcoin.rpc.getrawmempool()) wait_for(lambda: tx['txid'] in bitcoind.rpc.getrawmempool())
# Confirm all channels and wait for them to become usable # Confirm all channels and wait for them to become usable
bitcoin.generate_block(1) bitcoind.generate_block(1)
scids = [] scids = []
for src, dst in connections: for src, dst in connections:
wait_for(lambda: src.channel_state(dst) == 'CHANNELD_NORMAL') wait_for(lambda: src.channel_state(dst) == 'CHANNELD_NORMAL')
@ -1111,9 +1109,9 @@ class NodeFactory(object):
scids.append(scid) scids.append(scid)
if not wait_for_announce: if not wait_for_announce:
return nodes return
bitcoin.generate_block(5) bitcoind.generate_block(5)
def both_dirs_ready(n, scid): def both_dirs_ready(n, scid):
resp = n.rpc.listchannels(scid) resp = n.rpc.listchannels(scid)
@ -1129,6 +1127,12 @@ class NodeFactory(object):
for end in (nodes[0], nodes[-1]): for end in (nodes[0], nodes[-1]):
wait_for(lambda: 'alias' in only_one(end.rpc.listnodes(n.info['id'])['nodes'])) wait_for(lambda: 'alias' in only_one(end.rpc.listnodes(n.info['id'])['nodes']))
def line_graph(self, num_nodes, fundchannel=True, fundamount=10**6, wait_for_announce=False, opts=None, announce_channels=True):
""" Create nodes, connect them and optionally fund channels.
"""
nodes = self.get_nodes(num_nodes, opts=opts)
self.join_nodes(nodes, fundchannel, fundamount, wait_for_announce, announce_channels)
return nodes return nodes
def killall(self, expected_successes): def killall(self, expected_successes):