aboutsummaryrefslogtreecommitdiff
path: root/test/functional/test_framework
diff options
context:
space:
mode:
authorJon Atack <jon@atack.com>2019-11-24 12:05:38 +0100
committerJon Atack <jon@atack.com>2020-01-03 19:46:20 +0100
commit60aba1f2f11529add115d963d05599130288ae28 (patch)
tree4f6f6122b979fd900a09d6262d3117591f64ad99 /test/functional/test_framework
parent7851f14ccf2bcd1e9b2ad48e5e08881be06d9d21 (diff)
downloadbitcoin-60aba1f2f11529add115d963d05599130288ae28.tar.xz
rpc: simplify getaddressinfo labels, deprecate previous behavior
- change the value returned in the RPC getaddressinfo `labels` field to an array of label name strings - deprecate the previous behavior of returning a JSON hash structure containing label `name` and address `purpose` key/value pairs - update the relevant tests
Diffstat (limited to 'test/functional/test_framework')
-rwxr-xr-xtest/functional/test_framework/wallet_util.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/functional/test_framework/wallet_util.py b/test/functional/test_framework/wallet_util.py
index 3d81a61120..c0dfa4c3f0 100755
--- a/test/functional/test_framework/wallet_util.py
+++ b/test/functional/test_framework/wallet_util.py
@@ -88,11 +88,6 @@ def get_multisig(node):
p2sh_p2wsh_script=CScript([OP_HASH160, witness_script, OP_EQUAL]).hex(),
p2sh_p2wsh_addr=script_to_p2sh_p2wsh(script_code))
-def labels_value(name="", purpose="receive"):
- """Generate a getaddressinfo labels array from a name and purpose.
- Often used as the value of a labels kwarg for calling test_address below."""
- return [{"name": name, "purpose": purpose}]
-
def test_address(node, address, **kwargs):
"""Get address info for `address` and test whether the returned values are as expected."""
addr_info = node.getaddressinfo(address)