Skip to content

Commit

Permalink
tests: unify RPC argument to cli argument conversion and handle dicts…
Browse files Browse the repository at this point in the history
… and lists

When running tests with --usecli, unify the conversion from argument objects to
strings using a new function arg_to_cli(). This fixes boolean arguments when
using named arguments.

Also use json.dumps() to get the string values for arguments that are dicts and
lists so that bitcoind's JSON parser does not become confused.
  • Loading branch information
achow101 committed Jan 24, 2019
1 parent 82cf681 commit 1f77f67
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions test/functional/test_framework/test_node.py
Expand Up @@ -402,6 +402,14 @@ def __call__(self, *args, **kwargs):
def get_request(self, *args, **kwargs):
return lambda: self(*args, **kwargs)

def arg_to_cli(arg):
if isinstance(arg, bool):
return str(arg).lower()
elif isinstance(arg, dict) or isinstance(arg, list):
return json.dumps(arg)
else:
return str(arg)

class TestNodeCLI():
"""Interface to bitcoin-cli for an individual node"""

Expand Down Expand Up @@ -433,8 +441,8 @@ def batch(self, requests):

def send_cli(self, command=None, *args, **kwargs):
"""Run bitcoin-cli command. Deserializes returned string as python object."""
pos_args = [str(arg).lower() if type(arg) is bool else str(arg) for arg in args]
named_args = [str(key) + "=" + str(value) for (key, value) in kwargs.items()]
pos_args = [arg_to_cli(arg) for arg in args]
named_args = [str(key) + "=" + arg_to_cli(value) for (key, value) in kwargs.items()]
assert not (pos_args and named_args), "Cannot use positional arguments and named arguments in the same bitcoin-cli call"
p_args = [self.binary, "-datadir=" + self.datadir] + self.options
if named_args:
Expand Down

0 comments on commit 1f77f67

Please sign in to comment.