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

pyln-testing: in utils, update method fundbalancedchannel, now it also works with dualfund

Browse source 
and some cleanup, fundchannel has been returning tx, txid and outnum for years
This commit is contained in:
Simon Vrouwe 2022-01-14 13:38:54 +02:00 • committed by Rusty Russell
parent 2d06c38997
commit f84e1a0536
1 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -781,22 +781,15 @@ class LightningNode(object):
self.rpc.connect(remote_node.info['id'], 'localhost', remote_node.port) self.rpc.connect(remote_node.info['id'], 'localhost', remote_node.port)
# Make sure the fundchannel is confirmed.
num_tx = len(self.bitcoin.rpc.getrawmempool())
res = self.rpc.fundchannel(remote_node.info['id'], chan_capacity, feerate='slow', minconf=0, announce=announce, push_msat=Millisatoshi(chan_capacity * 500)) 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) blockid = self.bitcoin.generate_block(1, wait_for_mempool=res['txid'])[0]
blockid = self.bitcoin.generate_block(1)[0]
# Generate the scid. # Generate the scid.
outnum = get_tx_p2wsh_outnum(self.bitcoin, res['tx'], total_capacity)
if outnum is None:
raise ValueError("no outnum found. capacity {} tx {}".format(total_capacity, res['tx']))
for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']): for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']):
if txid == res['txid']: if txid == res['txid']:
txnum = i txnum = i
return '{}x{}x{}'.format(self.bitcoin.rpc.getblockcount(), txnum, outnum) return '{}x{}x{}'.format(self.bitcoin.rpc.getblockcount(), txnum, res['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']]
@ -897,8 +890,7 @@ class LightningNode(object):
res = self.rpc.fundchannel(l2.info['id'], amount, res = self.rpc.fundchannel(l2.info['id'], amount,
announce=announce_channel, announce=announce_channel,
**kwargs) **kwargs)
wait_for(lambda: res['txid'] in self.bitcoin.rpc.getrawmempool()) blockid = self.bitcoin.generate_block(1, wait_for_mempool=res['txid'])[0]
blockid = self.bitcoin.generate_block(1)[0]
for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']): for i, txid in enumerate(self.bitcoin.rpc.getblock(blockid)['tx']):
if txid == res['txid']: if txid == res['txid']: