diff options
| author | fanquake <fanquake@gmail.com> | 2019-12-11 20:10:59 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-12-11 20:33:28 -0500 |
| commit | 3f1966ead6b2324d863ae6c5d9956cf4b9e4b148 (patch) | |
| tree | 3dcd7aa290a0c65caacb8ec3500531e0216b4cda /test/functional/test_framework/test_node.py | |
| parent | 5948398b1866f94bdd19c6791b9b319bdee8b32e (diff) | |
| parent | b6f9e3576a1ea18572e4803aeb3f39330f0cb759 (diff) | |
| download | bitcoin-3f1966ead6b2324d863ae6c5d9956cf4b9e4b148.tar.xz | |
Merge #17705: test: re-enable CLI test support by using EncodeDecimal in json.dumps()
b6f9e3576a1ea18572e4803aeb3f39330f0cb759 test: re-enable CLI test support by using EncodeDecimal in json.dumps() (fanquake)
Pull request description:
As mentioned in https://github.com/bitcoin/bitcoin/pull/17675#issuecomment-563188648.
ACKs for top commit:
practicalswift:
ACK b6f9e3576a1ea18572e4803aeb3f39330f0cb759 assuming Travis is happy too -- diff looks correct :)
MarcoFalke:
> ACK b6f9e35 assuming Travis is happy too -- diff looks correct :)
Tree-SHA512: 79fa535cc1756c8ee610a3d6a316a1c4f036797d6990a5620e44985393a2e52f78450f8e0021d0a148c08705fd1ba765508464a365f9030ae0d2cacbd7a93e19
Diffstat (limited to 'test/functional/test_framework/test_node.py')
| -rwxr-xr-x | test/functional/test_framework/test_node.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py index 40681790b9..e5c77ae5fa 100755 --- a/test/functional/test_framework/test_node.py +++ b/test/functional/test_framework/test_node.py @@ -30,6 +30,7 @@ from .util import ( rpc_url, wait_until, p2p_port, + EncodeDecimal, ) BITCOIND_PROC_WAIT_TIMEOUT = 60 @@ -489,7 +490,7 @@ 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) + return json.dumps(arg, default=EncodeDecimal) else: return str(arg) |