From 645a8653c895e4fc7717e9e5ac045612b5deaa60 Mon Sep 17 00:00:00 2001
From: Jon Atack <jon@atack.com>
Date: Sat, 6 Jun 2020 20:30:50 +0200
Subject: [PATCH] rpc: remove deprecated getaddressinfo `label` field

---
 src/wallet/rpcwallet.cpp                      | 10 +----
 .../rpc_getaddressinfo_label_deprecation.py   | 43 -------------------
 test/functional/test_runner.py                |  1 -
 3 files changed, 1 insertion(+), 53 deletions(-)
 delete mode 100755 test/functional/rpc_getaddressinfo_label_deprecation.py

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index ae2b19e923d..a74ee583980 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3746,7 +3746,6 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
                             "hdseedid) and relation to the wallet (ismine, iswatchonly)."},
                         }},
                         {RPCResult::Type::BOOL, "iscompressed", /* optional */ true, "If the pubkey is compressed."},
-                        {RPCResult::Type::STR, "label", "DEPRECATED. The label associated with the address. Defaults to \"\". Replaced by the labels array below."},
                         {RPCResult::Type::NUM_TIME, "timestamp", /* optional */ true, "The creation time of the key, if available, expressed in " + UNIX_EPOCH_TIME + "."},
                         {RPCResult::Type::STR, "hdkeypath", /* optional */ true, "The HD keypath, if the key is HD and available."},
                         {RPCResult::Type::STR_HEX, "hdseedid", /* optional */ true, "The Hash160 of the HD seed."},
@@ -3801,14 +3800,6 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
     UniValue detail = DescribeWalletAddress(pwallet, dest);
     ret.pushKVs(detail);
 
-    // DEPRECATED: Return label field if existing. Currently only one label can
-    // be associated with an address, so the label should be equivalent to the
-    // value of the name key/value pair in the labels array below.
-    const auto* address_book_entry = pwallet->FindAddressBookEntry(dest);
-    if (pwallet->chain().rpcEnableDeprecated("label") && address_book_entry) {
-        ret.pushKV("label", address_book_entry->GetLabel());
-    }
-
     ret.pushKV("ischange", pwallet->IsChange(scriptPubKey));
 
     ScriptPubKeyMan* spk_man = pwallet->GetScriptPubKeyMan(scriptPubKey);
@@ -3829,6 +3820,7 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
     // stable if we allow multiple labels to be associated with an address in
     // the future.
     UniValue labels(UniValue::VARR);
+    const auto* address_book_entry = pwallet->FindAddressBookEntry(dest);
     if (address_book_entry) {
         // DEPRECATED: The previous behavior of returning an array containing a
         // JSON object of `name` and `purpose` key/value pairs is deprecated.
diff --git a/test/functional/rpc_getaddressinfo_label_deprecation.py b/test/functional/rpc_getaddressinfo_label_deprecation.py
deleted file mode 100755
index 09545ebce7e..00000000000
--- a/test/functional/rpc_getaddressinfo_label_deprecation.py
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env python3
-# Copyright (c) 2020-2019 The Bitcoin Core developers
-# Distributed under the MIT software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-"""
-Test deprecation of the RPC getaddressinfo `label` field. It has been
-superseded by the `labels` field.
-
-"""
-from test_framework.test_framework import BitcoinTestFramework
-
-class GetAddressInfoLabelDeprecationTest(BitcoinTestFramework):
-    def set_test_params(self):
-        self.num_nodes = 2
-        self.setup_clean_chain = False
-        # Start node[0] with -deprecatedrpc=label, and node[1] without.
-        self.extra_args = [["-deprecatedrpc=label"], []]
-
-    def skip_test_if_missing_module(self):
-        self.skip_if_no_wallet()
-
-    def test_label_with_deprecatedrpc_flag(self):
-        self.log.info("Test getaddressinfo label with -deprecatedrpc flag")
-        node = self.nodes[0]
-        address = node.getnewaddress()
-        info = node.getaddressinfo(address)
-        assert "label" in info
-
-    def test_label_without_deprecatedrpc_flag(self):
-        self.log.info("Test getaddressinfo label without -deprecatedrpc flag")
-        node = self.nodes[1]
-        address = node.getnewaddress()
-        info = node.getaddressinfo(address)
-        assert "label" not in info
-
-    def run_test(self):
-        """Test getaddressinfo label with and without -deprecatedrpc flag."""
-        self.test_label_with_deprecatedrpc_flag()
-        self.test_label_without_deprecatedrpc_flag()
-
-
-if __name__ == '__main__':
-    GetAddressInfoLabelDeprecationTest().main()
diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py
index 0ea65c68b87..8712eeca9e5 100755
--- a/test/functional/test_runner.py
+++ b/test/functional/test_runner.py
@@ -241,7 +241,6 @@ BASE_SCRIPTS = [
     'feature_blocksdir.py',
     'feature_config_args.py',
     'rpc_getaddressinfo_labels_purpose_deprecation.py',
-    'rpc_getaddressinfo_label_deprecation.py',
     'rpc_getdescriptorinfo.py',
     'rpc_help.py',
     'feature_help.py',