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

lightningd: listforwards shouldn't put in zero fields for fields we don't know.

Browse Source 
Technically, this is an API change :(  So I made it conditional.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-08-15 10:01:23 +09:30
parent 802ebe768c
commit f18b911032
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -35,6 +35,7 @@ Note: You should always set `allow-deprecated-apis=false` to test for
changes. changes.
- Plugin: using startup-relative paths for `plugin` and `plugin-dir`: they're now relative to `lightning-dir`. - Plugin: using startup-relative paths for `plugin` and `plugin-dir`: they're now relative to `lightning-dir`.
- JSON API: `listforwards` removed dummy (zero) fields for `out_msat`, `fee_msat`, `in_channel` and `out_channel` if unknown (i.e. deleted from db, or `status` is `local-failed`.
### Removed ### Removed

13
lightningd/peer_htlcs.c
View File

@ -19,6 +19,7 @@
#include <lightningd/jsonrpc.h> #include <lightningd/jsonrpc.h>
#include <lightningd/lightningd.h> #include <lightningd/lightningd.h>
#include <lightningd/log.h> #include <lightningd/log.h>
#include <lightningd/options.h>
#include <lightningd/pay.h> #include <lightningd/pay.h>
#include <lightningd/peer_control.h> #include <lightningd/peer_control.h>
#include <lightningd/peer_htlcs.h> #include <lightningd/peer_htlcs.h>
@ -2148,22 +2149,30 @@ void json_format_forwarding_object(struct json_stream *response,
{ {
json_object_start(response, fieldname); json_object_start(response, fieldname);
/* See 6d333f16cc0f3aac7097269bf0985b5fa06d59b4 */ /* See 6d333f16cc0f3aac7097269bf0985b5fa06d59b4: we may have deleted HTLC. */
if (cur->payment_hash) if (cur->payment_hash)
json_add_hex(response, "payment_hash", json_add_hex(response, "payment_hash",
cur->payment_hash, cur->payment_hash,
sizeof(*cur->payment_hash)); sizeof(*cur->payment_hash));
json_add_short_channel_id(response, "in_channel", &cur->channel_in); json_add_short_channel_id(response, "in_channel", &cur->channel_in);
json_add_short_channel_id(response, "out_channel", &cur->channel_out);
/* This can be unknown if we failed before channel lookup */
if (cur->channel_out.u64 != 0 || deprecated_apis)
json_add_short_channel_id(response, "out_channel",
&cur->channel_out);
json_add_amount_msat_compat(response, json_add_amount_msat_compat(response,
cur->msat_in, cur->msat_in,
"in_msatoshi", "in_msat"); "in_msatoshi", "in_msat");
/* These can be unset (aka zero) if we failed before channel lookup */
if (cur->channel_out.u64 != 0 || deprecated_apis) {
json_add_amount_msat_compat(response, json_add_amount_msat_compat(response,
cur->msat_out, cur->msat_out,
"out_msatoshi", "out_msat"); "out_msatoshi", "out_msat");
json_add_amount_msat_compat(response, json_add_amount_msat_compat(response,
cur->fee, cur->fee,
"fee", "fee_msat"); "fee", "fee_msat");
}
json_add_string(response, "status", forward_status_name(cur->status)); json_add_string(response, "status", forward_status_name(cur->status));
if(cur->failcode != 0) { if(cur->failcode != 0) {