mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 22:45:27 +01:00
Code Issues Projects Releases Wiki Activity

pay: fix delpay to actually delete.

Browse source 
It works for the trivial case, where groupid and partid are the same,
but silently deletes nothing in the other cases (or worse, deletes the
wrong entry!).

See: #5835
Changelog-Fixed: `delpay`: actually delete the specified payment (mainly found by `autoclean`).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2023-02-27 13:55:34 +10:30 • committed by Alex Myers
parent 38d90b2505
commit 355a7ae827
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lightningd/pay.c
View file

@ -1702,7 +1702,7 @@ static struct command_result *json_delpay(struct command *cmd,
"No payment for that payment_hash with that partid and groupid");
}
wallet_payment_delete(cmd->ld->wallet, payment_hash, partid, groupid);
wallet_payment_delete(cmd->ld->wallet, payment_hash, groupid, partid);
response = json_stream_success(cmd);
json_array_start(response, "payments");

31
tests/test_pay.py
View file

@ -5350,3 +5350,34 @@ def test_pay_multichannel_use_zeroconf(bitcoind, node_factory):
# 3. Send a payment over the zeroconf channel
riskfactor = 0
l1.rpc.pay(inv['bolt11'], riskfactor=riskfactor)
@pytest.mark.developer("needs dev-no-reconnect, dev-routes to force failover")
def test_delpay_works(node_factory, bitcoind):
"""
One failure, one success; deleting the success works (groupid=1, partid=2)
"""
l1, l2, l3 = node_factory.line_graph(3, fundamount=10**5,
wait_for_announce=True)
# Expensive route!
l4 = node_factory.get_node(options={'fee-per-satoshi': 1000,
'fee-base': 2000})
node_factory.join_nodes([l1, l4, l3], wait_for_announce=True)
# Don't give a hint, so l1 chooses cheapest.
inv = l3.dev_invoice(10**5, 'lbl', 'desc', dev_routes=[])
l3.rpc.disconnect(l2.info['id'], force=True)
l1.rpc.pay(inv['bolt11'])
assert len(l1.rpc.listsendpays()['payments']) == 2
failed = [p for p in l1.rpc.listsendpays()['payments'] if p['status'] == 'complete'][0]
l1.rpc.delpay(payment_hash=failed['payment_hash'],
status=failed['status'],
groupid=failed['groupid'],
partid=failed['partid'])
with pytest.raises(RpcError, match=r'No payment for that payment_hash'):
l1.rpc.delpay(payment_hash=failed['payment_hash'],
status=failed['status'],
groupid=failed['groupid'],
partid=failed['partid'])