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

jsonrpc: populate ld->jsonrpc ourselves, so we can use it.

Browse Source 
Next patch will call commands to get usage inside jsonrpc_new(): to do
this it will need access to ld->jsonrpc, so we can't use the current
pattern.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2019-02-04 21:25:42 +10:30
parent cc76416447
commit dabdefefae
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lightningd/jsonrpc.c
View File

@@ -803,20 +803,19 @@ bool jsonrpc_command_add(struct jsonrpc *rpc, struct json_command *command)
return true;
}
struct jsonrpc *jsonrpc_new(const tal_t *ctx, struct lightningd *ld)
void jsonrpc_setup(struct lightningd *ld)
{
struct jsonrpc *jsonrpc = tal(ctx, struct jsonrpc);
struct json_command **commands = get_cmdlist();
jsonrpc->commands = tal_arr(jsonrpc, struct json_command *, 0);
jsonrpc->log = new_log(jsonrpc, ld->log_book, "jsonrpc");
ld->jsonrpc = tal(ld, struct jsonrpc);
ld->jsonrpc->commands = tal_arr(ld->jsonrpc, struct json_command *, 0);
ld->jsonrpc->log = new_log(ld->jsonrpc, ld->log_book, "jsonrpc");
for (size_t i=0; i<num_cmdlist; i++) {
if (!jsonrpc_command_add_perm(jsonrpc, commands[i]))
if (!jsonrpc_command_add_perm(ld->jsonrpc, commands[i]))
fatal("Cannot add duplicate command %s",
commands[i]->name);
}
jsonrpc->rpc_listener = NULL;
return jsonrpc;
ld->jsonrpc->rpc_listener = NULL;
}
bool command_usage_only(const struct command *cmd)