From 7f32a844f99961a99b66e5cf9eebb81e0e0a056b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 25 Mar 2020 14:09:41 +1030 Subject: [PATCH] listnodes/listpeers/peer_connected: remove deprecated `globalfeatures` and `localfeatures` Signed-off-by: Rusty Russell Changelog-Removed: JSON: `listnodes` `globalfeatures` output (`features` since in 0.7.3). Changelog-Removed: JSON: `listpeers` `localfeatures` and `globalfeatures` output (`features` since in 0.7.3). Changelog-Removed: JSON: `peer_connected` hook `localfeatures` and `globalfeatures` output (`features` since in 0.7.3). --- lightningd/gossip_control.c | 3 --- lightningd/peer_control.c | 9 --------- 2 files changed, 12 deletions(-) diff --git a/lightningd/gossip_control.c b/lightningd/gossip_control.c index e7a53f92c..58d2ee347 100644 --- a/lightningd/gossip_control.c +++ b/lightningd/gossip_control.c @@ -267,9 +267,6 @@ static void json_getnodes_reply(struct subd *gossip UNUSED, const u8 *reply, nodes[i]->color, ARRAY_SIZE(nodes[i]->color)); json_add_u64(response, "last_timestamp", nodes[i]->last_timestamp); - if (deprecated_apis) - json_add_hex_talarr(response, "globalfeatures", - nodes[i]->features); json_add_hex_talarr(response, "features", nodes[i]->features); json_array_start(response, "addresses"); for (j=0; jaddresses); j++) { diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index cbdddc9ba..8e82862eb 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -851,10 +851,6 @@ peer_connected_serialize(struct peer_connected_hook_payload *payload, json_add_string( stream, "addr", type_to_string(stream, struct wireaddr_internal, &payload->addr)); - if (deprecated_apis) { - json_add_hex_talarr(stream, "globalfeatures", NULL); - json_add_hex_talarr(stream, "localfeatures", p->features); - } json_add_hex_talarr(stream, "features", p->features); json_object_end(stream); /* .peer */ } @@ -1177,11 +1173,6 @@ static void json_add_peer(struct lightningd *ld, struct wireaddr_internal, &p->addr)); json_array_end(response); - if (deprecated_apis) { - json_add_hex_talarr(response, "globalfeatures", NULL); - json_add_hex_talarr(response, "localfeatures", - p->features); - } json_add_hex_talarr(response, "features", p->features); }