aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-23 06:54:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

plugins/pay: fix attempt counter on failure message.

Browse Source 
An "attempt" is when we actually try to send, not every route lookup
we do.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-06-12 10:08:46 +09:30
parent 1e32b4ab29
commit 260febd88b
3 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
plugins/pay.c
View File

@@ -27,6 +27,8 @@ struct pay_attempt {
const char **excludes;
/* Route we got (NULL == route lookup fail). */
const char *route;
/* Did we actually try to send a payment? */
bool sendpay;
/* The failure result (NULL on success) */
const char *failure;
/* The non-failure result (NULL on failure) */
@@ -161,13 +163,26 @@ static bool channel_in_routehint(const struct route_info *routehint,
return false;
}
/* Count times we actually tried to pay, not where route lookup failed or
* we disliked route for being too expensive, etc. */
static size_t count_sendpays(const struct pay_attempt *attempts)
{
size_t n = 0;
for (size_t i = 0; i < tal_count(attempts); i++)
n += attempts[i].sendpay;
return n;
}
static struct command_result *waitsendpay_expired(struct command *cmd,
struct pay_command *pc)
{
char *errmsg, *data;
size_t num_attempts = count_sendpays(pc->ps->attempts);
errmsg = tal_fmt(pc, "Gave up after %zu attempts",
tal_count(pc->ps->attempts));
errmsg = tal_fmt(pc, "Gave up after %zu attempt%s: see paystatus",
num_attempts, num_attempts == 1 ? "" : "s");
data = tal_strdup(pc, "{ 'attempts': [ ");
for (size_t i = 0; i < tal_count(pc->ps->attempts); i++) {
if (pc->ps->attempts[i].route)
@@ -187,6 +202,8 @@ static struct command_result *waitsendpay_expired(struct command *cmd,
static struct command_result *next_routehint(struct command *cmd,
struct pay_command *pc)
{
size_t num_attempts = count_sendpays(pc->ps->attempts);
if (tal_count(pc->routehints) > 0) {
pc->current_routehint = pc->routehints[0];
tal_arr_remove(&pc->routehints, 0);
@@ -199,11 +216,11 @@ static struct command_result *next_routehint(struct command *cmd,
return command_fail(cmd, PAY_ROUTE_TOO_EXPENSIVE,
"%s", pc->expensive_route);
if (tal_count(pc->ps->attempts) > 1)
if (num_attempts > 0)
return command_fail(cmd, PAY_STOPPED_RETRYING,
"Ran out of routes to try after"
" %zu attempts: see paystatus",
tal_count(pc->ps->attempts));
" %zu attempt%s: see paystatus",
num_attempts, num_attempts == 1 ? "" : "s");
return command_fail(cmd, PAY_ROUTE_NOT_FOUND,
"Could not find a route");
@@ -517,6 +534,7 @@ static struct command_result *getroute_done(struct command *cmd,
else
json_desc = "";
attempt->sendpay = true;
return send_outreq(cmd, "sendpay", sendpay_done, sendpay_error, pc,
"'route': %s, 'payment_hash': '%s', 'bolt11': '%s'%s",
attempt->route,
@@ -583,6 +601,7 @@ static struct command_result *start_pay_attempt(struct command *cmd,
attempt->route = NULL;
attempt->failure = NULL;
attempt->result = NULL;
attempt->sendpay = false;
attempt->why = tal_vfmt(pc->ps, fmt, ap);
va_end(ap);

2
tests/test_misc.py
View File

@@ -910,7 +910,7 @@ def test_htlc_send_timeout(node_factory, bitcoind):
timedout = True
inv = l3.rpc.invoice(123000, 'test_htlc_send_timeout', 'description')
with pytest.raises(RpcError, match=r'Ran out of routes to try after [0-9] attempts') as excinfo:
with pytest.raises(RpcError, match=r'Ran out of routes to try after 2 attempts') as excinfo:
l1.rpc.pay(inv['bolt11'])
err = excinfo.value

10
tests/test_pay.py
View File

@@ -1489,8 +1489,14 @@ def test_pay_retry(node_factory, bitcoind):
# This should make it fail.
exhaust_channel(l4, l5, scid45, 10**8)
with pytest.raises(RpcError, match=r'5 attempts'):
l1.rpc.pay(l5.rpc.invoice(10**8, 'test_retry2', 'test_retry2')['bolt11'])
# It won't try l1->l5, since it knows that's under capacity.
# It will try l1->l2->l5, which fails.
# It will try l1->l2->l3->l5, which fails.
# It will try l1->l2->l3->l4->l5, which fails.
# It then tries l1->l2->l3->l4->l5, because of routeboost, which fails.
inv = l5.rpc.invoice(10**8, 'test_retry2', 'test_retry2')['bolt11']
with pytest.raises(RpcError, match=r'4 attempts'):
l1.rpc.pay(inv)
@unittest.skipIf(not DEVELOPER, "needs DEVELOPER=1 otherwise gossip takes 5 minutes!")