aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-19 15:14:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: handle case where funding tx is not tx #1.

Browse Source 
e.g. in test_closing_id we can get a spend from the first (closed) channel
in the same block as the open of the second.  Half the time, we'll choose
the wrong one as scid.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-04-07 17:19:42 +09:30
committed by Christian Decker
parent c0a40b37a7
commit 402f7f90c0
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
contrib/pyln-testing/pyln/testing/utils.py
View File

@@ -742,18 +742,20 @@ class LightningNode(object):
# Make sure the fundchannel is confirmed. # Make sure the fundchannel is confirmed.
num_tx = len(self.bitcoin.rpc.getrawmempool()) num_tx = len(self.bitcoin.rpc.getrawmempool())
tx = self.rpc.fundchannel(remote_node.info['id'], chan_capacity, feerate='slow', minconf=0, announce=announce, push_msat=Millisatoshi(chan_capacity * 500))['tx'] res = self.rpc.fundchannel(remote_node.info['id'], chan_capacity, feerate='slow', minconf=0, announce=announce, push_msat=Millisatoshi(chan_capacity * 500))
wait_for(lambda: len(self.bitcoin.rpc.getrawmempool()) == num_tx + 1) wait_for(lambda: len(self.bitcoin.rpc.getrawmempool()) == num_tx + 1)
self.bitcoin.generate_block(1) blockid = self.bitcoin.generate_block(1)[0]
# Generate the scid. # Generate the scid.
# NOTE This assumes only the coinbase and the fundchannel is outnum = get_tx_p2wsh_outnum(self.bitcoin, res['tx'], total_capacity)
# confirmed in the block.
outnum = get_tx_p2wsh_outnum(self.bitcoin, tx, total_capacity)
if outnum is None: if outnum is None:
raise ValueError("no outnum found. capacity {} tx {}".format(total_capacity, tx)) raise ValueError("no outnum found. capacity {} tx {}".format(total_capacity, res['tx']))
return '{}x1x{}'.format(self.bitcoin.rpc.getblockcount(), outnum) for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']):
if txid == res['txid']:
txnum = i
return '{}x{}x{}'.format(self.bitcoin.rpc.getblockcount(), txnum, outnum)
def getactivechannels(self): def getactivechannels(self):
return [c for c in self.rpc.listchannels()['channels'] if c['active']] return [c for c in self.rpc.listchannels()['channels'] if c['active']]
@@ -855,11 +857,15 @@ class LightningNode(object):
announce=announce_channel, announce=announce_channel,
**kwargs) **kwargs)
wait_for(lambda: res['txid'] in self.bitcoin.rpc.getrawmempool()) wait_for(lambda: res['txid'] in self.bitcoin.rpc.getrawmempool())
self.bitcoin.generate_block(1) blockid = self.bitcoin.generate_block(1)[0]
# Hacky way to find our output. for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']):
scid = "{}x1x{}".format(self.bitcoin.rpc.getblockcount(), if txid == res['txid']:
get_tx_p2wsh_outnum(self.bitcoin, res['tx'], amount)) txnum = i
scid = "{}x{}x{}".format(self.bitcoin.rpc.getblockcount(),
txnum,
get_tx_p2wsh_outnum(self.bitcoin, res['tx'], amount))
if wait_for_active: if wait_for_active:
self.wait_channel_active(scid) self.wait_channel_active(scid)