From ec1505199ea06a820ae6935ae2356250a13612b1 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 12 Dec 2019 10:50:46 +1030 Subject: [PATCH] lightningd: fix failure message in waitsendpay with multi-part payments. Bastien TEINTURIER writes: > One thing I noticed but didn't investigate much: after sending the two > payments, I tried using `waitsendpay` and it reported an error *208* > (*"Never attempted payment for > '98ee736d29d860948e436546a88b0cc84f267de8818531b0fdbe6ce3d080f22a'"*). > > I was expecting the result to be something like: "payment succeeded for > that payment hash" (the HTLCs were correctly settled). Indeed, if you waitsendpay without specifying a partid, you are waiting for 0, which may not exist. Clarify the error msg. Reported-by: @t-bast Signed-off-by: Rusty Russell --- lightningd/pay.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lightningd/pay.c b/lightningd/pay.c index 446fd9823..f56fad7b6 100644 --- a/lightningd/pay.c +++ b/lightningd/pay.c @@ -627,7 +627,9 @@ static struct command_result *wait_payment(struct lightningd *ld, payment_hash, partid); if (!payment) { return command_fail(cmd, PAY_NO_SUCH_PAYMENT, - "Never attempted payment for '%s'", + "Never attempted payment part %"PRIu64 + " for '%s'", + partid, type_to_string(tmpctx, struct sha256, payment_hash)); }