aboutsummaryrefslogtreecommitdiff
path: root/test/functional/wallet_import_rescan.py
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2017-10-20 13:27:55 -0400
committerRussell Yanofsky <russ@yanofsky.org>2018-03-19 12:05:35 -0400
commit045eeb887092a631d49194e743859b1da84c1d5d (patch)
treef51ebb3d012ec3912ac85e63d8cf68e0146c116c /test/functional/wallet_import_rescan.py
parentc39dd2ef59c986576726cc356a27165486fd0d65 (diff)
downloadbitcoin-045eeb887092a631d49194e743859b1da84c1d5d.tar.xz
Rename account to label where appropriate
This change only updates strings and adds RPC aliases, but should simplify the implementation of address labels in https://github.com/bitcoin/bitcoin/pull/7729, by getting renaming out of the way and letting it focus on semantics. The difference between accounts and labels is that labels apply only to addresses, while accounts apply to both addresses and transactions (transactions have "from" and "to" accounts). The code associating accounts with transactions is clumsy and unreliable so we would like get rid of it.
Diffstat (limited to 'test/functional/wallet_import_rescan.py')
-rwxr-xr-xtest/functional/wallet_import_rescan.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/wallet_import_rescan.py b/test/functional/wallet_import_rescan.py
index bfd4638481..b66e9b5d91 100755
--- a/test/functional/wallet_import_rescan.py
+++ b/test/functional/wallet_import_rescan.py
@@ -78,7 +78,7 @@ class Variant(collections.namedtuple("Variant", "call data rescan prune")):
if txid is not None:
tx, = [tx for tx in txs if tx["txid"] == txid]
- assert_equal(tx["account"], self.label)
+ assert_equal(tx["label"], self.label)
assert_equal(tx["address"], self.address["address"])
assert_equal(tx["amount"], amount)
assert_equal(tx["category"], "receive")