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

plugin: add in deprecated_api behavior and test

Browse Source 
we also check that the node isn't running now, for extra pedancity
This commit is contained in:
lisa neigut
2020-03-07 18:24:47 -06:00
committed by Rusty Russell
parent b25a8ba29d
commit 41b18050a0
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lightningd/plugin.c
View File

@@ -1128,11 +1128,13 @@ plugin_populate_init_request(struct plugin *plugin, struct jsonrpc_request *req)
name = opt->name + 2; name = opt->name + 2;
if (opt->value->as_bool) { if (opt->value->as_bool) {
json_add_bool(req->stream, name, *opt->value->as_bool); json_add_bool(req->stream, name, *opt->value->as_bool);
continue; if (!deprecated_apis)
continue;
} }
if (opt->value->as_int) { if (opt->value->as_int) {
json_add_s64(req->stream, name, *opt->value->as_int); json_add_s64(req->stream, name, *opt->value->as_int);
continue; if (!deprecated_apis)
continue;
} }
if (opt->value->as_str) { if (opt->value->as_str) {
json_add_string(req->stream, name, opt->value->as_str); json_add_string(req->stream, name, opt->value->as_str);

19
tests/test_plugin.py
View File

@@ -55,7 +55,7 @@ def test_option_types(node_factory):
'plugin': plugin_path, 'plugin': plugin_path,
'str_opt': 'ok', 'str_opt': 'ok',
'int_opt': 22, 'int_opt': 22,
'bool_opt': 1, 'bool_opt': True,
}) })
n.daemon.is_in_log(r"option str_opt ok <class 'str'>") n.daemon.is_in_log(r"option str_opt ok <class 'str'>")
@@ -82,6 +82,7 @@ def test_option_types(node_factory):
}, expect_fail=True, may_fail=True) }, expect_fail=True, may_fail=True)
# the node should fail to start, and we get a stderr msg # the node should fail to start, and we get a stderr msg
assert not n.daemon.running
assert n.daemon.is_in_stderr('bool_opt: ! does not parse as type bool') assert n.daemon.is_in_stderr('bool_opt: ! does not parse as type bool')
# What happens if we give it a bad int-option? # What happens if we give it a bad int-option?
@@ -93,8 +94,24 @@ def test_option_types(node_factory):
}, may_fail=True, expect_fail=True) }, may_fail=True, expect_fail=True)
# the node should fail to start, and we get a stderr msg # the node should fail to start, and we get a stderr msg
assert not n.daemon.running
assert n.daemon.is_in_stderr('--int_opt: notok does not parse as type int') assert n.daemon.is_in_stderr('--int_opt: notok does not parse as type int')
plugin_path = os.path.join(os.getcwd(), 'tests/plugins/options.py')
n = node_factory.get_node(options={
'plugin': plugin_path,
'str_opt': 'ok',
'int_opt': 22,
'bool_opt': 1,
})
n.daemon.is_in_log(r"option str_opt ok <class 'str'>")
n.daemon.is_in_log(r"option int_opt 22 <class 'int'>")
n.daemon.is_in_log(r"option int_opt 22 <class 'str'>")
n.daemon.is_in_log(r"option bool_opt True <class 'bool'>")
n.daemon.is_in_log(r"option bool_opt true <class 'str'>")
n.stop()
def test_millisatoshi_passthrough(node_factory): def test_millisatoshi_passthrough(node_factory):
""" Ensure that Millisatoshi arguments and return work. """ Ensure that Millisatoshi arguments and return work.