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

libplugin: make deprecated_apis a global

Browse Source
This commit is contained in:
darosior
2020-02-05 00:16:01 +01:00
committed by Rusty Russell
parent 02fe34ed95
commit b6b2e6727e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/fundchannel.c
View File

@@ -314,7 +314,7 @@ static struct command_result *fundchannel_start(struct command *cmd,
json_out_start(ret, NULL, '{'); json_out_start(ret, NULL, '{');
json_out_addstr(ret, "id", node_id_to_hexstr(tmpctx, fr->id)); json_out_addstr(ret, "id", node_id_to_hexstr(tmpctx, fr->id));
if (cmd->plugin->deprecated_apis) if (deprecated_apis)
json_out_addstr(ret, "satoshi", fr->funding_str); json_out_addstr(ret, "satoshi", fr->funding_str);
else else
json_out_addstr(ret, "amount", fr->funding_str); json_out_addstr(ret, "amount", fr->funding_str);
@@ -446,7 +446,7 @@ static struct command_result *json_fundchannel(struct command *cmd,
struct funding_req *fr = tal(cmd, struct funding_req); struct funding_req *fr = tal(cmd, struct funding_req);
/* For generating help, give new-style. */ /* For generating help, give new-style. */
if (!params || !cmd->plugin->deprecated_apis || params->type == JSMN_ARRAY) { if (!params || !deprecated_apis || params->type == JSMN_ARRAY) {
if (!param(cmd, buf, params, if (!param(cmd, buf, params,
p_req("id", param_node_id, &fr->id), p_req("id", param_node_id, &fr->id),
p_req("amount", param_string_check_sat, &fr->funding_str), p_req("amount", param_string_check_sat, &fr->funding_str),

4
plugins/libplugin.c
View File

@@ -21,6 +21,8 @@
const struct chainparams *chainparams; const struct chainparams *chainparams;
bool deprecated_apis;
struct plugin_timer { struct plugin_timer {
struct timer timer; struct timer timer;
struct command_result *(*cb)(struct plugin *p); struct command_result *(*cb)(struct plugin *p);
@@ -666,7 +668,7 @@ static struct command_result *handle_init(struct command *cmd,
strerror(errno)); strerror(errno));
param_obj = json_out_obj(NULL, "config", "allow-deprecated-apis"); param_obj = json_out_obj(NULL, "config", "allow-deprecated-apis");
p->deprecated_apis = streq(rpc_delve(tmpctx, p, "listconfigs", deprecated_apis = streq(rpc_delve(tmpctx, p, "listconfigs",
take(param_obj), take(param_obj),
".allow-deprecated-apis"), ".allow-deprecated-apis"),
"true"); "true");

4
plugins/libplugin.h
View File

@@ -19,6 +19,8 @@
struct json_out; struct json_out;
struct rpc_conn; struct rpc_conn;
extern bool deprecated_apis;
enum plugin_restartability { enum plugin_restartability {
PLUGIN_STATIC, PLUGIN_STATIC,
PLUGIN_RESTARTABLE PLUGIN_RESTARTABLE
@@ -72,8 +74,6 @@ struct plugin {
/* Timers */ /* Timers */
struct timers timers; struct timers timers;
size_t in_timer; size_t in_timer;
bool deprecated_apis;
}; };
struct command { struct command {