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

pytest: make test_restart_many_payments more Pythony!

Browse Source 
IIUC, namedtuple is like tuple for grown-ups: Pythonify!

Suggested-by: @cdecker
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-10-10 09:09:05 +10:30
parent 0226ef0572
commit a4730089e8
1 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tests/test_connection.py
View File

@@ -1,3 +1,4 @@
from collections import namedtuple
from fixtures import * # noqa: F401,F403 from fixtures import * # noqa: F401,F403
from lightning import RpcError from lightning import RpcError
from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND from utils import DEVELOPER, only_one, wait_for, sync_blockheight, VALGRIND
@@ -1341,7 +1342,7 @@ def test_fulfill_incoming_first(node_factory, bitcoind):
# We agree on fee change first, then add HTLC, then remove; stop after remove. # We agree on fee change first, then add HTLC, then remove; stop after remove.
disconnects = ['+WIRE_COMMITMENT_SIGNED*3'] disconnects = ['+WIRE_COMMITMENT_SIGNED*3']
# We manually reconnect l2 & l3, after 100 blocks; hence allowing manual # We manually reconnect l2 & l3, after 100 blocks; hence allowing manual
# reconnect, but disabling auto coneect, and massive cltv so 2/3 doesn't # reconnect, but disabling auto connect, and massive cltv so 2/3 doesn't
# time out. # time out.
l1, l2, l3 = node_factory.line_graph(3, opts=[{}, l1, l2, l3 = node_factory.line_graph(3, opts=[{},
{'may_reconnect': True, {'may_reconnect': True,
@@ -1400,37 +1401,41 @@ def test_restart_many_payments(node_factory):
outchans.append(l1.fund_channel(n, 10**6)) outchans.append(l1.fund_channel(n, 10**6))
# Manually create routes, get invoices # Manually create routes, get invoices
route = [] Payment = namedtuple('Payment', ['innode', 'route', 'payment_hash'])
payment_hash = []
to_pay = []
for i in range(len(innodes)): for i in range(len(innodes)):
# This one will cause WIRE_INCORRECT_CLTV_EXPIRY from l1. # This one will cause WIRE_INCORRECT_CLTV_EXPIRY from l1.
route.append([{'msatoshi': 100001001, route = [{'msatoshi': 100001001,
'id': l1.info['id'], 'id': l1.info['id'],
'delay': 10, 'delay': 10,
'channel': inchans[i]}, 'channel': inchans[i]},
{'msatoshi': 100000000, {'msatoshi': 100000000,
'id': outnodes[i].info['id'], 'id': outnodes[i].info['id'],
'delay': 5, 'delay': 5,
'channel': outchans[i]}]) 'channel': outchans[i]}]
payment_hash.append(outnodes[i].rpc.invoice(100000000, "invoice", "invoice")['payment_hash']) payment_hash = outnodes[i].rpc.invoice(100000000, "invoice", "invoice")['payment_hash']
to_pay.append(Payment(innodes[i], route, payment_hash))
# This one should be routed through to the outnode. # This one should be routed through to the outnode.
route.append([{'msatoshi': 100001001, route = [{'msatoshi': 100001001,
'id': l1.info['id'], 'id': l1.info['id'],
'delay': 11, 'delay': 11,
'channel': inchans[i]}, 'channel': inchans[i]},
{'msatoshi': 100000000, {'msatoshi': 100000000,
'id': outnodes[i].info['id'], 'id': outnodes[i].info['id'],
'delay': 5, 'delay': 5,
'channel': outchans[i]}]) 'channel': outchans[i]}]
payment_hash.append(outnodes[i].rpc.invoice(100000000, "invoice2", "invoice2")['payment_hash']) payment_hash = outnodes[i].rpc.invoice(100000000, "invoice2", "invoice2")['payment_hash']
to_pay.append(Payment(innodes[i], route, payment_hash))
# sendpay is async. # sendpay is async.
for i in range(len(payment_hash)): for p in to_pay:
innodes[i // 2].rpc.sendpay(route[i], payment_hash[i]) p.innode.rpc.sendpay(p.route, p.payment_hash)
# Now restart l1 while traffic is flowing... # Now restart l1 while traffic is flowing...
l1.restart() l1.restart()
# Wait for them to finish. # Wait for them to finish.
for i in range(len(innodes)): for n in innodes:
wait_for(lambda: 'pending' not in [p['status'] for p in innodes[i].rpc.listpayments()['payments']]) wait_for(lambda: 'pending' not in [p['status'] for p in n.rpc.listpayments()['payments']])