davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

lightningd: actually deprecate old notification fields now tests and plugins are all updated.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Deprecated: JSON-RPC: `connect`, `disconnect` and `block_added` notification fields outside the same-named object (use .connect/.disconnect/.block_added sub-objects)
This commit is contained in:
Shahana Farooqui
2023-07-07 11:39:38 +09:30
committed by Rusty Russell
parent 99b885c84c
commit 1606ef1487
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lightningd/notification.c
View File

@@ -57,8 +57,8 @@ static void connect_notification_serialize(struct json_stream *stream,
const struct wireaddr_internal *addr) const struct wireaddr_internal *addr)
{ {
/* Old style: Add raw fields without connect key */ /* Old style: Add raw fields without connect key */
/* FIXME: Deprecate! */ if (deprecated_apis)
json_add_connect_fields(stream, nodeid, incoming, addr); json_add_connect_fields(stream, nodeid, incoming, addr);
json_object_start(stream, "connect"); json_object_start(stream, "connect");
json_add_connect_fields(stream, nodeid, incoming, addr); json_add_connect_fields(stream, nodeid, incoming, addr);
json_object_end(stream); json_object_end(stream);
@@ -94,8 +94,8 @@ static void disconnect_notification_serialize(struct json_stream *stream,
struct node_id *nodeid) struct node_id *nodeid)
{ {
/* Old style: Add raw fields without disconnect key */ /* Old style: Add raw fields without disconnect key */
/* FIXME: deprecate! */ if (deprecated_apis)
json_add_disconnect_fields(stream, nodeid); json_add_disconnect_fields(stream, nodeid);
json_object_start(stream, "disconnect"); json_object_start(stream, "disconnect");
json_add_disconnect_fields(stream, nodeid); json_add_disconnect_fields(stream, nodeid);
json_object_end(stream); json_object_end(stream);
@@ -609,10 +609,11 @@ static void json_add_block_added_fields(struct json_stream *stream,
static void block_added_notification_serialize(struct json_stream *stream, static void block_added_notification_serialize(struct json_stream *stream,
struct block *block) struct block *block)
{ {
/* FIXME: deprecate! */ if (deprecated_apis) {
json_object_start(stream, "block"); json_object_start(stream, "block");
json_add_block_added_fields(stream, block); json_add_block_added_fields(stream, block);
json_object_end(stream); json_object_end(stream);
}
json_object_start(stream, "block_added"); json_object_start(stream, "block_added");
json_add_block_added_fields(stream, block); json_add_block_added_fields(stream, block);
json_object_end(stream); json_object_end(stream);