From faf0f848ef18e1d917bce942a2c09cadf1211a7e Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 22 May 2026 17:34:15 +0200 Subject: [PATCH] test: use echojson to allow rpc_named_arguments.py --usecli The echo and echojson RPCs are identical in the server. The only difference is that echojson is in the client conversion table. --- test/functional/rpc_named_arguments.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/functional/rpc_named_arguments.py b/test/functional/rpc_named_arguments.py index ce1bbda41a9..9f8248c833f 100755 --- a/test/functional/rpc_named_arguments.py +++ b/test/functional/rpc_named_arguments.py @@ -10,10 +10,10 @@ from test_framework.util import ( assert_raises_rpc_error, ) + class NamedArgumentTest(BitcoinTestFramework): def set_test_params(self): self.num_nodes = 1 - self.supports_cli = False def run_test(self): node = self.nodes[0] @@ -25,14 +25,14 @@ class NamedArgumentTest(BitcoinTestFramework): h = node.getblockhash(height=0) node.getblock(blockhash=h) - assert_equal(node.echo(), []) - assert_equal(node.echo(arg0=0,arg9=9), [0] + [None]*8 + [9]) - assert_equal(node.echo(arg1=1), [None, 1]) - assert_equal(node.echo(arg9=None), [None]*10) - assert_equal(node.echo(arg0=0,arg3=3,arg9=9), [0] + [None]*2 + [3] + [None]*5 + [9]) - assert_equal(node.echo(0, 1, arg3=3, arg5=5), [0, 1, None, 3, None, 5]) - assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echo, 0, 1, arg1=1) - assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echo, 0, None, 2, arg1=1) + assert_equal(node.echojson(), []) + assert_equal(node.echojson(arg0=0, arg9=9), [0] + [None] * 8 + [9]) + assert_equal(node.echojson(arg1=1), [None, 1]) + assert_equal(node.echojson(arg9=None), [] if self.options.usecli else [None] * 10) + assert_equal(node.echojson(arg0=0, arg3=3, arg9=9), [0] + [None] * 2 + [3] + [None] * 5 + [9]) + assert_equal(node.echojson(0, 1, arg3=3, arg5=5), [0, 1, None, 3, None, 5]) + assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echojson, 0, 1, arg1=1) + assert_raises_rpc_error(-8, "Parameter arg1 specified twice both as positional and named argument", node.echojson, 0, None, 2, arg1=1) if __name__ == '__main__': NamedArgumentTest(__file__).main()