mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-02-22 14:42:40 +01:00
Code Issues Projects Releases Wiki Activity

lightningd: set filter when we see 'filter' object.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: JSON-RPC: `filter` object allows reduction of JSON response to (most) commands.
This commit is contained in:
Rusty Russell 2022-11-09 14:10:57 +10:30
parent 3b4c1968a3
commit 2a14afbf21
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lightningd/jsonrpc.c
View file

@ -462,6 +462,16 @@ struct command_result *command_success(struct command *cmd,
{ {
assert(cmd); assert(cmd);
assert(cmd->json_stream == result); assert(cmd->json_stream == result);
/* Filter will get upset if we close "result" object it didn't
* see! */
if (cmd->filter) {
const char *err = json_stream_detach_filter(tmpctx, result);
if (err)
json_add_string(result, "warning_parameter_filter",
err);
}
json_object_end(result); json_object_end(result);
json_object_end(result); json_object_end(result);
@ -606,6 +616,10 @@ struct json_stream *json_stream_success(struct command *cmd)
{ {
struct json_stream *r = json_start(cmd); struct json_stream *r = json_start(cmd);
json_object_start(r, "result"); json_object_start(r, "result");
/* We have results? OK, start filtering */
if (cmd->filter)
json_stream_attach_filter(r, cmd->filter);
return r; return r;
} }
@ -869,7 +883,7 @@ REGISTER_PLUGIN_HOOK(rpc_command,
static struct command_result * static struct command_result *
parse_request(struct json_connection *jcon, const jsmntok_t tok[]) parse_request(struct json_connection *jcon, const jsmntok_t tok[])
{ {
const jsmntok_t *method, *id, *params, *jsonrpc; const jsmntok_t *method, *id, *params, *filter, *jsonrpc;
struct command *c; struct command *c;
struct rpc_command_hook_payload *rpc_hook; struct rpc_command_hook_payload *rpc_hook;
bool completed; bool completed;
@ -882,6 +896,7 @@ parse_request(struct json_connection *jcon, const jsmntok_t tok[])
method = json_get_member(jcon->buffer, tok, "method"); method = json_get_member(jcon->buffer, tok, "method");
params = json_get_member(jcon->buffer, tok, "params"); params = json_get_member(jcon->buffer, tok, "params");
filter = json_get_member(jcon->buffer, tok, "filter");
id = json_get_member(jcon->buffer, tok, "id"); id = json_get_member(jcon->buffer, tok, "id");
if (!id) { if (!id) {
@ -929,6 +944,13 @@ parse_request(struct json_connection *jcon, const jsmntok_t tok[])
"Expected string for method"); "Expected string for method");
} }
if (filter) {
struct command_result *ret;
ret = parse_filter(c, "filter", jcon->buffer, filter);
if (ret)
return ret;
}
/* Debug was too chatty, so we use IO here, even though we're /* Debug was too chatty, so we use IO here, even though we're
* actually just logging the id */ * actually just logging the id */
log_io(jcon->log, LOG_IO_IN, NULL, c->id, NULL, 0); log_io(jcon->log, LOG_IO_IN, NULL, c->id, NULL, 0);