From 1cfb8425f5dd29200c9a5aa4c38820a8f47d1329 Mon Sep 17 00:00:00 2001 From: darosior Date: Tue, 24 Dec 2019 23:27:47 +0100 Subject: [PATCH] plugin_control: more descriptive key for 'plugin stop' result Changelog-Changed: JSONRPC: 'plugin stop' result is now accessible using the 'result' key instead of the empty ('') key. --- lightningd/plugin_control.c | 7 ++++++- tests/test_plugin.py | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/lightningd/plugin_control.c b/lightningd/plugin_control.c index af4506bcb..10413f877 100644 --- a/lightningd/plugin_control.c +++ b/lightningd/plugin_control.c @@ -1,3 +1,4 @@ +#include #include #include @@ -206,7 +207,11 @@ plugin_dynamic_stop(struct command *cmd, const char *plugin_name) plugin_kill(p, "%s stopped by lightningd via RPC", plugin_name); tal_free(p); response = json_stream_success(cmd); - json_add_string(response, "", + if (deprecated_apis) + json_add_string(response, "", + take(tal_fmt(NULL, "Successfully stopped %s.", + plugin_name))); + json_add_string(response, "result", take(tal_fmt(NULL, "Successfully stopped %s.", plugin_name))); return command_success(cmd, response); diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 4a22174da..ca0a594b6 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -127,14 +127,16 @@ def test_plugin_command(node_factory): n.rpc.plugin_list() # Make sure the plugin behaves normally after stop and restart - assert("Successfully stopped helloworld.py." == n.rpc.plugin_stop(plugin="helloworld.py")['']) + assert("Successfully stopped helloworld.py." + == n.rpc.plugin_stop(plugin="helloworld.py")["result"]) n.daemon.wait_for_log(r"Killing plugin: helloworld.py") n.rpc.plugin_start(plugin=os.path.join(os.getcwd(), "contrib/plugins/helloworld.py")) n.daemon.wait_for_log(r"Plugin helloworld.py initialized") assert("Hello world" == n.rpc.call(method="hello")) # Now stop the helloworld plugin - assert("Successfully stopped helloworld.py." == n.rpc.plugin_stop(plugin="helloworld.py")['']) + assert("Successfully stopped helloworld.py." + == n.rpc.plugin_stop(plugin="helloworld.py")["result"]) n.daemon.wait_for_log(r"Killing plugin: helloworld.py") # Make sure that the 'hello' command from the helloworld.py plugin # is not available anymore.