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: don't use bogus scids for first hop of route.

Browse Source 
This was a legacy from when it was redundant: with multiple channels, it
no longer is!

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-08-09 07:19:29 +09:30
committed by neil saitug
parent 8a9ce55345
commit 9543204b79
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1102,11 +1102,15 @@ class LightningNode(object):
invoices = dst.rpc.listinvoices(label)['invoices'] invoices = dst.rpc.listinvoices(label)['invoices']
assert len(invoices) == 1 and invoices[0]['status'] == 'unpaid' assert len(invoices) == 1 and invoices[0]['status'] == 'unpaid'
# Pick first normal channel.
scid = [c['short_channel_id'] for c in only_one(self.rpc.listpeers(dst_id)['peers'])['channels']
if c['state'] == 'CHANNELD_NORMAL'][0]
routestep = { routestep = {
'amount_msat': amt, 'amount_msat': amt,
'id': dst_id, 'id': dst_id,
'delay': 5, 'delay': 5,
'channel': '1x1x1' # note: can be bogus for 1-hop direct payments 'channel': scid
} }
# sendpay is async now # sendpay is async now

13
tests/test_closing.py
View File

@@ -7,7 +7,8 @@ from utils import (
account_balance, first_channel_id, closing_fee, TEST_NETWORK, account_balance, first_channel_id, closing_fee, TEST_NETWORK,
scriptpubkey_addr, calc_lease_fee, EXPERIMENTAL_FEATURES, scriptpubkey_addr, calc_lease_fee, EXPERIMENTAL_FEATURES,
check_utxos_channel, anchor_expected, check_coin_moves, check_utxos_channel, anchor_expected, check_coin_moves,
check_balance_snaps, mine_funding_to_announce, check_inspect_channel check_balance_snaps, mine_funding_to_announce, check_inspect_channel,
first_scid
) )
import os import os
@@ -1887,7 +1888,7 @@ def test_onchaind_replay(node_factory, bitcoind):
'amount_msat': 10**8 - 1, 'amount_msat': 10**8 - 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 101, 'delay': 101,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret'])
l1.daemon.wait_for_log('sendrawtx exit 0') l1.daemon.wait_for_log('sendrawtx exit 0')
@@ -1947,7 +1948,7 @@ def test_onchain_dust_out(node_factory, bitcoind, executor):
'amount_msat': 1, 'amount_msat': 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret'])
@@ -2019,7 +2020,7 @@ def test_onchain_timeout(node_factory, bitcoind, executor):
'amount_msat': 10**8 - 1, 'amount_msat': 10**8 - 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret'], groupid=1) l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret'], groupid=1)
@@ -2505,7 +2506,7 @@ def test_onchain_feechange(node_factory, bitcoind, executor):
'amount_msat': 10**8 - 1, 'amount_msat': 10**8 - 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
executor.submit(l1.rpc.sendpay, [routestep], rhash, payment_secret=inv['payment_secret']) executor.submit(l1.rpc.sendpay, [routestep], rhash, payment_secret=inv['payment_secret'])
@@ -2589,7 +2590,7 @@ def test_onchain_all_dust(node_factory, bitcoind, executor):
'amount_msat': 10**7 - 1, 'amount_msat': 10**7 - 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
executor.submit(l1.rpc.sendpay, [routestep], rhash, payment_secret=inv['payment_secret']) executor.submit(l1.rpc.sendpay, [routestep], rhash, payment_secret=inv['payment_secret'])

18
tests/test_connection.py
View File

@@ -9,7 +9,7 @@ from utils import (
expected_channel_features, expected_channel_features,
check_coin_moves, first_channel_id, account_balance, basic_fee, check_coin_moves, first_channel_id, account_balance, basic_fee,
scriptpubkey_addr, default_ln_port, scriptpubkey_addr, default_ln_port,
EXPERIMENTAL_FEATURES, mine_funding_to_announce EXPERIMENTAL_FEATURES, mine_funding_to_announce, first_scid
) )
from pyln.testing.utils import SLOW_MACHINE, VALGRIND, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT from pyln.testing.utils import SLOW_MACHINE, VALGRIND, EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT
@@ -749,7 +749,7 @@ def test_reconnect_sender_add1(node_factory):
rhash = inv['payment_hash'] rhash = inv['payment_hash']
assert only_one(l2.rpc.listinvoices('test_reconnect_sender_add1')['invoices'])['status'] == 'unpaid' assert only_one(l2.rpc.listinvoices('test_reconnect_sender_add1')['invoices'])['status'] == 'unpaid'
route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'}] route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}]
for i in range(0, len(disconnects)): for i in range(0, len(disconnects)):
with pytest.raises(RpcError): with pytest.raises(RpcError):
@@ -788,7 +788,7 @@ def test_reconnect_sender_add(node_factory):
rhash = inv['payment_hash'] rhash = inv['payment_hash']
assert only_one(l2.rpc.listinvoices('testpayment')['invoices'])['status'] == 'unpaid' assert only_one(l2.rpc.listinvoices('testpayment')['invoices'])['status'] == 'unpaid'
route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'}] route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}]
# This will send commit, so will reconnect as required. # This will send commit, so will reconnect as required.
l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret'])
@@ -822,7 +822,7 @@ def test_reconnect_receiver_add(node_factory):
rhash = inv['payment_hash'] rhash = inv['payment_hash']
assert only_one(l2.rpc.listinvoices('testpayment2')['invoices'])['status'] == 'unpaid' assert only_one(l2.rpc.listinvoices('testpayment2')['invoices'])['status'] == 'unpaid'
route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'}] route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}]
l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret'])
for i in range(len(disconnects)): for i in range(len(disconnects)):
l1.daemon.wait_for_log('Already have funding locked in') l1.daemon.wait_for_log('Already have funding locked in')
@@ -852,7 +852,7 @@ def test_reconnect_receiver_fulfill(node_factory):
rhash = inv['payment_hash'] rhash = inv['payment_hash']
assert only_one(l2.rpc.listinvoices('testpayment2')['invoices'])['status'] == 'unpaid' assert only_one(l2.rpc.listinvoices('testpayment2')['invoices'])['status'] == 'unpaid'
route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'}] route = [{'amount_msat': amt, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}]
l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay(route, rhash, payment_secret=inv['payment_secret'])
for i in range(len(disconnects)): for i in range(len(disconnects)):
l1.daemon.wait_for_log('Already have funding locked in') l1.daemon.wait_for_log('Already have funding locked in')
@@ -3480,7 +3480,7 @@ def test_htlc_retransmit_order(node_factory, executor):
'amount_msat': 1000, 'amount_msat': 1000,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' # note: can be bogus for 1-hop direct payments 'channel': first_scid(l1, l2)
} }
for inv in invoices: for inv in invoices:
executor.submit(l1.rpc.sendpay, [routestep], inv['payment_hash'], payment_secret=inv['payment_secret']) executor.submit(l1.rpc.sendpay, [routestep], inv['payment_hash'], payment_secret=inv['payment_secret'])
@@ -3600,7 +3600,7 @@ def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
'amount_msat': 1, 'amount_msat': 1,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' # note: can be bogus for 1-hop direct payments 'channel': first_scid(l1, l2)
} }
l1.rpc.sendpay([routestep], '00' * 32, payment_secret='00' * 32) l1.rpc.sendpay([routestep], '00' * 32, payment_secret='00' * 32)
with pytest.raises(RpcError, match=r'WIRE_INCORRECT_OR_UNKNOWN_PAYMENT_DETAILS'): with pytest.raises(RpcError, match=r'WIRE_INCORRECT_OR_UNKNOWN_PAYMENT_DETAILS'):
@@ -3725,7 +3725,7 @@ def test_upgrade_statickey_fail(node_factory, executor, bitcoind):
'hold-result': 'fail'}]) 'hold-result': 'fail'}])
# This HTLC will fail # This HTLC will fail
l1.rpc.sendpay([{'amount_msat': 1000, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'}], '00' * 32, payment_secret='00' * 32) l1.rpc.sendpay([{'amount_msat': 1000, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}], '00' * 32, payment_secret='00' * 32)
# Each one should cause one disconnection, no upgrade. # Each one should cause one disconnection, no upgrade.
for d in l1_disconnects + l2_disconnects: for d in l1_disconnects + l2_disconnects:
@@ -3801,7 +3801,7 @@ def test_htlc_failed_noclose(node_factory):
'amount_msat': FUNDAMOUNT * 1000, 'amount_msat': FUNDAMOUNT * 1000,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' # note: can be bogus for 1-hop direct payments 'channel': first_scid(l1, l2)
} }
# This fails at channeld # This fails at channeld

6
tests/test_pay.py
View File

@@ -6,7 +6,7 @@ from pyln.proto.onion import TlvPayload
from pyln.testing.utils import EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT from pyln.testing.utils import EXPERIMENTAL_DUAL_FUND, FUNDAMOUNT
from utils import ( from utils import (
DEVELOPER, wait_for, only_one, sync_blockheight, TIMEOUT, DEVELOPER, wait_for, only_one, sync_blockheight, TIMEOUT,
EXPERIMENTAL_FEATURES, VALGRIND, mine_funding_to_announce EXPERIMENTAL_FEATURES, VALGRIND, mine_funding_to_announce, first_scid
) )
import copy import copy
import os import os
@@ -572,7 +572,7 @@ def test_sendpay(node_factory):
'amount_msat': amt, 'amount_msat': amt,
'id': l2.info['id'], 'id': l2.info['id'],
'delay': 5, 'delay': 5,
'channel': '1x1x1' 'channel': first_scid(l1, l2)
} }
# Insufficient funds. # Insufficient funds.
@@ -671,7 +671,7 @@ def test_sendpay(node_factory):
inv = l2.rpc.invoice(amt, 'testpayment3', 'desc') inv = l2.rpc.invoice(amt, 'testpayment3', 'desc')
rhash = inv['payment_hash'] rhash = inv['payment_hash']
assert only_one(l2.rpc.listinvoices('testpayment3')['invoices'])['status'] == 'unpaid' assert only_one(l2.rpc.listinvoices('testpayment3')['invoices'])['status'] == 'unpaid'
routestep = {'amount_msat': amt * 2, 'id': l2.info['id'], 'delay': 5, 'channel': '1x1x1'} routestep = {'amount_msat': amt * 2, 'id': l2.info['id'], 'delay': 5, 'channel': first_scid(l1, l2)}
l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret']) l1.rpc.sendpay([routestep], rhash, payment_secret=inv['payment_secret'])
preimage3 = l1.rpc.waitsendpay(rhash)['payment_preimage'] preimage3 = l1.rpc.waitsendpay(rhash)['payment_preimage']
assert only_one(l2.rpc.listinvoices('testpayment3')['invoices'])['status'] == 'paid' assert only_one(l2.rpc.listinvoices('testpayment3')['invoices'])['status'] == 'paid'

4
tests/utils.py
View File

@@ -412,6 +412,10 @@ def first_channel_id(n1, n2):
return only_one(only_one(n1.rpc.listpeers(n2.info['id'])['peers'])['channels'])['channel_id'] return only_one(only_one(n1.rpc.listpeers(n2.info['id'])['peers'])['channels'])['channel_id']
def first_scid(n1, n2):
return only_one(only_one(n1.rpc.listpeers(n2.info['id'])['peers'])['channels'])['short_channel_id']
def basic_fee(feerate): def basic_fee(feerate):
if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND: if EXPERIMENTAL_FEATURES or EXPERIMENTAL_DUAL_FUND:
# option_anchor_outputs # option_anchor_outputs