mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-03 17:54:19 +02:00
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
This commit is contained in:
@@ -29,7 +29,6 @@ from test_framework.util import (
|
||||
from test_framework.wallet_util import (
|
||||
get_key,
|
||||
get_multisig,
|
||||
labels_value,
|
||||
test_address,
|
||||
)
|
||||
|
||||
@@ -571,7 +570,7 @@ class ImportMultiTest(BitcoinTestFramework):
|
||||
solvable=True,
|
||||
ismine=True,
|
||||
label=p2sh_p2wpkh_label,
|
||||
labels=labels_value(name=p2sh_p2wpkh_label))
|
||||
labels=[p2sh_p2wpkh_label])
|
||||
|
||||
# Test ranged descriptor fails if range is not specified
|
||||
xpriv = "tprv8ZgxMBicQKsPeuVhWwi6wuMQGfPKi9Li5GtX35jVNknACgqe3CY4g5xgkfDDJcmtF7o1QnxWDRYw4H5P26PXq7sbcUkEqeR4fg3Kxp2tigg"
|
||||
@@ -643,7 +642,7 @@ class ImportMultiTest(BitcoinTestFramework):
|
||||
solvable=True,
|
||||
ismine=False,
|
||||
label=p2pkh_label,
|
||||
labels=labels_value(name=p2pkh_label))
|
||||
labels=[p2pkh_label])
|
||||
|
||||
# Test import fails if both desc and scriptPubKey are provided
|
||||
key = get_key(self.nodes[0])
|
||||
|
||||
Reference in New Issue
Block a user