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

pyln-tests: tweak fundbalancedchannel to assume peer will match

Browse Source 
we got rid of push_msats for dual funded channels. this assumes that hte
peer will match an equal amount of sats as ours (the df_accepter.py
plugin will do this)
This commit is contained in:
niftynei
2020-12-15 19:41:57 -06:00
committed by Christian Decker
parent e964c31369
commit ea1895fc1e
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -698,19 +698,32 @@ class LightningNode(object):
total_capacity = int(total_capacity) total_capacity = int(total_capacity)
self.fundwallet(total_capacity + 10000) self.fundwallet(total_capacity + 10000)
if remote_node.config('experimental-dual-fund'):
remote_node.fundwallet(total_capacity + 10000)
# We cut the total_capacity in half, since the peer's
# expected to contribute that same amount
chan_capacity = total_capacity // 2
total_capacity = chan_capacity * 2
else:
chan_capacity = total_capacity
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. # 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'], total_capacity, feerate='slow', minconf=0, announce=announce, push_msat=Millisatoshi(total_capacity * 500))['tx'] tx = self.rpc.fundchannel(remote_node.info['id'], chan_capacity, feerate='slow', minconf=0, announce=announce, push_msat=Millisatoshi(chan_capacity * 500))['tx']
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) self.bitcoin.generate_block(1)
# Generate the scid. # Generate the scid.
# NOTE This assumes only the coinbase and the fundchannel is # NOTE This assumes only the coinbase and the fundchannel is
# confirmed in the block. # confirmed in the block.
return '{}x1x{}'.format(self.bitcoin.rpc.getblockcount(), outnum = get_tx_p2wsh_outnum(self.bitcoin, tx, total_capacity)
get_tx_p2wsh_outnum(self.bitcoin, tx, total_capacity)) if outnum is None:
raise ValueError("no outnum found. capacity {} tx {}".format(total_capacity, tx))
return '{}x1x{}'.format(self.bitcoin.rpc.getblockcount(), 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']]