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

listsendpays: remove deprecated "null" amount_msat.

Browse Source 
Changelog-Removed: `listsendpays` will no longer add `amount_msat` `null` (deprecated 0.9.1).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-01-29 10:30:09 +10:30
parent 9eeb290637
commit 406eb37717
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lightningd/pay.c
View File

@@ -129,9 +129,6 @@ void json_add_payment_fields(struct json_stream *response,
if (amount_msat_greater(t->msatoshi, AMOUNT_MSAT(0))) if (amount_msat_greater(t->msatoshi, AMOUNT_MSAT(0)))
json_add_amount_msat_compat(response, t->msatoshi, "msatoshi", json_add_amount_msat_compat(response, t->msatoshi, "msatoshi",
"amount_msat"); "amount_msat");
else if (deprecated_apis)
json_add_null(response, "amount_msat");
json_add_amount_msat_compat(response, t->msatoshi_sent, json_add_amount_msat_compat(response, t->msatoshi_sent,
"msatoshi_sent", "amount_sent_msat"); "msatoshi_sent", "amount_sent_msat");

8
plugins/pay.c
View File

@@ -1722,8 +1722,7 @@ static void add_amount_sent(struct plugin *p,
/* If this is an unannotated partial payment we drop out estimate for /* If this is an unannotated partial payment we drop out estimate for
* all parts. */ * all parts. */
/* FIXME: with deprecated_apis, amount_msat can be 'null' */ if (msattok == NULL) {
if (msattok == NULL || !json_to_msat(buf, msattok, &recv)) {
mpp->amount = tal_free(mpp->amount); mpp->amount = tal_free(mpp->amount);
return; return;
} }
@@ -1734,6 +1733,11 @@ static void add_amount_sent(struct plugin *p,
if (mpp->amount == NULL) if (mpp->amount == NULL)
return; return;
if (!json_to_msat(buf, msattok, &recv))
plugin_err(p, "Cannot convert amount_sat %.*s",
json_tok_full_len(msattok),
json_tok_full(buf, msattok));
if (!amount_msat_add(mpp->amount, *mpp->amount, recv)) if (!amount_msat_add(mpp->amount, *mpp->amount, recv))
plugin_log(p, LOG_BROKEN, plugin_log(p, LOG_BROKEN,
"Cannot add amount_msat for %s: %s + %s", "Cannot add amount_msat for %s: %s + %s",