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: Don't assume UTXO ordering when selecting coins

Browse Source 
This was failing because the internal coin-selection doesn't go by insertion
order when using postgres.
This commit is contained in:
Christian Decker
2019-10-17 17:20:24 +02:00
committed by neil saitug
parent ec8d774b29
commit 0a641c9443
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_connection.py
View File

@@ -761,9 +761,7 @@ def test_deprecated_fundchannel(node_factory, bitcoind):
bitcoind.generate_block(1) bitcoind.generate_block(1)
sync_blockheight(bitcoind, [l1]) sync_blockheight(bitcoind, [l1])
wait_for(lambda: len(l1.rpc.listfunds()["outputs"]) == 8) wait_for(lambda: len(l1.rpc.listfunds()["outputs"]) == 8)
utxos = [utxo["txid"] + ":" + str(utxo["output"]) for utxo in l1.rpc.listfunds()["outputs"]]
# No 'amount' nor 'satoshi'(array type) # No 'amount' nor 'satoshi'(array type)
with pytest.raises(RpcError, match=r'missing required parameter: amount'): with pytest.raises(RpcError, match=r'missing required parameter: amount'):
@@ -772,10 +770,18 @@ def test_deprecated_fundchannel(node_factory, bitcoind):
with pytest.raises(RpcError, match=r'.* should be a satoshi amount, not .*'): with pytest.raises(RpcError, match=r'.* should be a satoshi amount, not .*'):
l1.rpc.call('fundchannel', [nodes[0].info['id'], 'slow']) l1.rpc.call('fundchannel', [nodes[0].info['id'], 'slow'])
def get_utxo(node):
"""Get an unspent but confirmed output
"""
outputs = node.rpc.listfunds()['outputs']
for o in outputs:
if o['status'] == 'confirmed':
return "{}:{}".format(o['txid'], o['output'])
# Array type # Array type
l1.rpc.call('fundchannel', [nodes[0].info['id'], amount, '2000perkw', False, 1, [utxos[0]]]) l1.rpc.call('fundchannel', [nodes[0].info['id'], amount, '2000perkw', False, 1, [get_utxo(l1)]])
l1.rpc.call('fundchannel', [nodes[1].info['id'], amount, '2000perkw', False, None, [utxos[1]]]) l1.rpc.call('fundchannel', [nodes[1].info['id'], amount, '2000perkw', False, None, [get_utxo(l1)]])
l1.rpc.call('fundchannel', [nodes[2].info['id'], amount, '2000perkw', None, None, [utxos[2]]]) l1.rpc.call('fundchannel', [nodes[2].info['id'], amount, '2000perkw', None, None, [get_utxo(l1)]])
l1.rpc.call('fundchannel', [nodes[3].info['id'], amount, '2000perkw', True, 1]) l1.rpc.call('fundchannel', [nodes[3].info['id'], amount, '2000perkw', True, 1])
# No 'amount' nor 'satoshi'(object type) # No 'amount' nor 'satoshi'(object type)
@@ -784,7 +790,7 @@ def test_deprecated_fundchannel(node_factory, bitcoind):
# Old style(object type) # Old style(object type)
l1.rpc.call('fundchannel', {'id': nodes[4].info['id'], 'satoshi': 'all', 'feerate': 'slow', l1.rpc.call('fundchannel', {'id': nodes[4].info['id'], 'satoshi': 'all', 'feerate': 'slow',
'announce': True, 'minconf': 1, 'utxos': [utxos[4]]}) 'announce': True, 'minconf': 1, 'utxos': [get_utxo(l1)]})
l1.rpc.call('fundchannel', {'id': nodes[5].info['id'], 'satoshi': 'all', 'feerate': 'slow', 'minconf': 1}) l1.rpc.call('fundchannel', {'id': nodes[5].info['id'], 'satoshi': 'all', 'feerate': 'slow', 'minconf': 1})
l1.rpc.call('fundchannel', {'id': nodes[6].info['id'], 'satoshi': 'all', 'feerate': 'slow'}) l1.rpc.call('fundchannel', {'id': nodes[6].info['id'], 'satoshi': 'all', 'feerate': 'slow'})
l1.rpc.call('fundchannel', {'id': nodes[7].info['id'], 'satoshi': 'all'}) l1.rpc.call('fundchannel', {'id': nodes[7].info['id'], 'satoshi': 'all'})