[tests] Remove wallet accounts test

The accounts API will be removed in the next commit. Remove all
functional tests for the accounts API.

3 files changed, 18 insertions, 245 deletions

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 9e7d0dc745..abfd66efad 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -96,7 +96,6 @@ BITCOIN_TESTS =\
 
 if ENABLE_WALLET
 BITCOIN_TESTS += \
-  wallet/test/accounting_tests.cpp \
   wallet/test/psbt_wallet_tests.cpp \
   wallet/test/wallet_tests.cpp \
   wallet/test/wallet_crypto_tests.cpp \
diff --git a/src/wallet/test/accounting_tests.cpp b/src/wallet/test/accounting_tests.cpp
deleted file mode 100644
index 79060887be..0000000000
--- a/src/wallet/test/accounting_tests.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright (c) 2012-2018 The Bitcoin Core developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://www.opensource.org/licenses/mit-license.php.
-
-#include <wallet/wallet.h>
-
-#include <wallet/test/wallet_test_fixture.h>
-
-#include <stdint.h>
-
-#include <boost/test/unit_test.hpp>
-
-BOOST_FIXTURE_TEST_SUITE(accounting_tests, WalletTestingSetup)
-
-static void
-GetResults(CWallet& wallet, std::map<CAmount, CAccountingEntry>& results)
-{
-    std::list<CAccountingEntry> aes;
-
-    results.clear();
-    BOOST_CHECK(wallet.ReorderTransactions() == DBErrors::LOAD_OK);
-    wallet.ListAccountCreditDebit("", aes);
-    for (CAccountingEntry& ae : aes)
-    {
-        results[ae.nOrderPos] = ae;
-    }
-}
-
-BOOST_AUTO_TEST_CASE(acc_orderupgrade)
-{
-    std::vector<CWalletTx*> vpwtx;
-    CWalletTx wtx(nullptr /* pwallet */, MakeTransactionRef());
-    CAccountingEntry ae;
-    std::map<CAmount, CAccountingEntry> results;
-
-    LOCK(m_wallet.cs_wallet);
-
-    ae.strAccount = "";
-    ae.nCreditDebit = 1;
-    ae.nTime = 1333333333;
-    ae.strOtherAccount = "b";
-    ae.strComment = "";
-    m_wallet.AddAccountingEntry(ae);
-
-    wtx.mapValue["comment"] = "z";
-    m_wallet.AddToWallet(wtx);
-    vpwtx.push_back(&m_wallet.mapWallet.at(wtx.GetHash()));
-    vpwtx[0]->nTimeReceived = (unsigned int)1333333335;
-    vpwtx[0]->nOrderPos = -1;
-
-    ae.nTime = 1333333336;
-    ae.strOtherAccount = "c";
-    m_wallet.AddAccountingEntry(ae);
-
-    GetResults(m_wallet, results);
-
-    BOOST_CHECK(m_wallet.nOrderPosNext == 3);
-    BOOST_CHECK(2 == results.size());
-    BOOST_CHECK(results[0].nTime == 1333333333);
-    BOOST_CHECK(results[0].strComment.empty());
-    BOOST_CHECK(1 == vpwtx[0]->nOrderPos);
-    BOOST_CHECK(results[2].nTime == 1333333336);
-    BOOST_CHECK(results[2].strOtherAccount == "c");
-
-
-    ae.nTime = 1333333330;
-    ae.strOtherAccount = "d";
-    ae.nOrderPos = m_wallet.IncOrderPosNext();
-    m_wallet.AddAccountingEntry(ae);
-
-    GetResults(m_wallet, results);
-
-    BOOST_CHECK(results.size() == 3);
-    BOOST_CHECK(m_wallet.nOrderPosNext == 4);
-    BOOST_CHECK(results[0].nTime == 1333333333);
-    BOOST_CHECK(1 == vpwtx[0]->nOrderPos);
-    BOOST_CHECK(results[2].nTime == 1333333336);
-    BOOST_CHECK(results[3].nTime == 1333333330);
-    BOOST_CHECK(results[3].strComment.empty());
-
-
-    wtx.mapValue["comment"] = "y";
-    {
-        CMutableTransaction tx(*wtx.tx);
-        ++tx.nLockTime;  // Just to change the hash :)
-        wtx.SetTx(MakeTransactionRef(std::move(tx)));
-    }
-    m_wallet.AddToWallet(wtx);
-    vpwtx.push_back(&m_wallet.mapWallet.at(wtx.GetHash()));
-    vpwtx[1]->nTimeReceived = (unsigned int)1333333336;
-
-    wtx.mapValue["comment"] = "x";
-    {
-        CMutableTransaction tx(*wtx.tx);
-        ++tx.nLockTime;  // Just to change the hash :)
-        wtx.SetTx(MakeTransactionRef(std::move(tx)));
-    }
-    m_wallet.AddToWallet(wtx);
-    vpwtx.push_back(&m_wallet.mapWallet.at(wtx.GetHash()));
-    vpwtx[2]->nTimeReceived = (unsigned int)1333333329;
-    vpwtx[2]->nOrderPos = -1;
-
-    GetResults(m_wallet, results);
-
-    BOOST_CHECK(results.size() == 3);
-    BOOST_CHECK(m_wallet.nOrderPosNext == 6);
-    BOOST_CHECK(0 == vpwtx[2]->nOrderPos);
-    BOOST_CHECK(results[1].nTime == 1333333333);
-    BOOST_CHECK(2 == vpwtx[0]->nOrderPos);
-    BOOST_CHECK(results[3].nTime == 1333333336);
-    BOOST_CHECK(results[4].nTime == 1333333330);
-    BOOST_CHECK(results[4].strComment.empty());
-    BOOST_CHECK(5 == vpwtx[1]->nOrderPos);
-
-
-    ae.nTime = 1333333334;
-    ae.strOtherAccount = "e";
-    ae.nOrderPos = -1;
-    m_wallet.AddAccountingEntry(ae);
-
-    GetResults(m_wallet, results);
-
-    BOOST_CHECK(results.size() == 4);
-    BOOST_CHECK(m_wallet.nOrderPosNext == 7);
-    BOOST_CHECK(0 == vpwtx[2]->nOrderPos);
-    BOOST_CHECK(results[1].nTime == 1333333333);
-    BOOST_CHECK(2 == vpwtx[0]->nOrderPos);
-    BOOST_CHECK(results[3].nTime == 1333333336);
-    BOOST_CHECK(results[3].strComment.empty());
-    BOOST_CHECK(results[4].nTime == 1333333330);
-    BOOST_CHECK(results[4].strComment.empty());
-    BOOST_CHECK(results[5].nTime == 1333333334);
-    BOOST_CHECK(6 == vpwtx[1]->nOrderPos);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/functional/wallet_labels.py b/test/functional/wallet_labels.py
index 0817054149..01a73d9cef 100755
--- a/test/functional/wallet_labels.py
+++ b/test/functional/wallet_labels.py
@@ -5,15 +5,9 @@
 """Test label RPCs.
 
 RPCs tested are:
-    - getaccountaddress
-    - getaddressesbyaccount/getaddressesbylabel
+    - getaddressesbylabel
     - listaddressgroupings
     - setlabel
-    - sendfrom (with account arguments)
-    - move (with account arguments)
-
-Run the test twice - once using the accounts API and once using the labels API.
-The accounts API test can be removed in V0.18.
 """
 from collections import defaultdict
 
@@ -23,22 +17,11 @@ from test_framework.util import assert_equal, assert_raises_rpc_error
 class WalletLabelsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
-        self.num_nodes = 2
-        self.extra_args = [['-deprecatedrpc=accounts'], []]
-
-    def setup_network(self):
-        """Don't connect nodes."""
-        self.setup_nodes()
+        self.num_nodes = 1
 
     def run_test(self):
-        """Run the test twice - once using the accounts API and once using the labels API."""
-        self.log.info("Test accounts API")
-        self._run_subtest(True, self.nodes[0])
-        self.log.info("Test labels API")
-        self._run_subtest(False, self.nodes[1])
-
-    def _run_subtest(self, accounts_api, node):
-        # Check that there's no UTXO on any of the nodes
+        # Check that there's no UTXO on the node
+        node = self.nodes[0]
         assert_equal(len(node.listunspent()), 0)
 
         # Note each time we call generate, all generated coins go into
@@ -61,17 +44,12 @@ class WalletLabelsTest(BitcoinTestFramework):
             linked_addresses.add(address_group[0][0])
 
         # send 50 from each address to a third address not in this wallet
-        # There's some fee that will come back to us when the miner reward
-        # matures.
         common_address = "msf4WtN1YQKXvNtvdFYt9JBnUD2FB41kjr"
-        txid = node.sendmany(
-            fromaccount="",
+        node.sendmany(
             amounts={common_address: 100},
             subtractfeefrom=[common_address],
             minconf=1,
         )
-        tx_details = node.gettransaction(txid)
-        fee = -tx_details['details'][0]['fee']
         # there should be 1 address group, with the previously
         # unlinked addresses now linked (they both have 0 balance)
         address_groups = node.listaddressgroupings()
@@ -85,32 +63,22 @@ class WalletLabelsTest(BitcoinTestFramework):
         # we want to reset so that the "" label has what's expected.
         # otherwise we're off by exactly the fee amount as that's mined
         # and matures in the next 100 blocks
-        if accounts_api:
-            node.sendfrom("", common_address, fee)
         amount_to_send = 1.0
 
         # Create labels and make sure subsequent label API calls
         # recognize the label/address associations.
-        labels = [Label(name, accounts_api) for name in ("a", "b", "c", "d", "e")]
+        labels = [Label(name) for name in ("a", "b", "c", "d", "e")]
         for label in labels:
-            if accounts_api:
-                address = node.getaccountaddress(label.name)
-            else:
-                address = node.getnewaddress(label.name)
+            address = node.getnewaddress(label.name)
             label.add_receive_address(address)
             label.verify(node)
 
         # Check all labels are returned by listlabels.
         assert_equal(node.listlabels(), [label.name for label in labels])
 
-        # Send a transaction to each label, and make sure this forces
-        # getaccountaddress to generate a new receiving address.
+        # Send a transaction to each label.
         for label in labels:
-            if accounts_api:
-                node.sendtoaddress(label.receive_address, amount_to_send)
-                label.add_receive_address(node.getaccountaddress(label.name))
-            else:
-                node.sendtoaddress(label.addresses[0], amount_to_send)
+            node.sendtoaddress(label.addresses[0], amount_to_send)
             label.verify(node)
 
         # Check the amounts received.
@@ -120,32 +88,17 @@ class WalletLabelsTest(BitcoinTestFramework):
                 node.getreceivedbyaddress(label.addresses[0]), amount_to_send)
             assert_equal(node.getreceivedbylabel(label.name), amount_to_send)
 
-        # Check that sendfrom label reduces listaccounts balances.
         for i, label in enumerate(labels):
             to_label = labels[(i + 1) % len(labels)]
-            if accounts_api:
-                node.sendfrom(label.name, to_label.receive_address, amount_to_send)
-            else:
-                node.sendtoaddress(to_label.addresses[0], amount_to_send)
+            node.sendtoaddress(to_label.addresses[0], amount_to_send)
         node.generate(1)
         for label in labels:
-            if accounts_api:
-                address = node.getaccountaddress(label.name)
-            else:
-                address = node.getnewaddress(label.name)
+            address = node.getnewaddress(label.name)
             label.add_receive_address(address)
             label.verify(node)
             assert_equal(node.getreceivedbylabel(label.name), 2)
-            if accounts_api:
-                node.move(label.name, "", node.getbalance(label.name))
             label.verify(node)
         node.generate(101)
-        expected_account_balances = {"": 5200}
-        for label in labels:
-            expected_account_balances[label.name] = 0
-        if accounts_api:
-            assert_equal(node.listaccounts(), expected_account_balances)
-            assert_equal(node.getbalance(""), 5200)
 
         # Check that setlabel can assign a label to a new unused address.
         for label in labels:
@@ -153,10 +106,7 @@ class WalletLabelsTest(BitcoinTestFramework):
             node.setlabel(address, label.name)
             label.add_address(address)
             label.verify(node)
-            if accounts_api:
-                assert address not in node.getaddressesbyaccount("")
-            else:
-                assert_raises_rpc_error(-11, "No addresses with label", node.getaddressesbylabel, "")
+            assert_raises_rpc_error(-11, "No addresses with label", node.getaddressesbylabel, "")
 
         # Check that addmultisigaddress can assign labels.
         for label in labels:
@@ -167,35 +117,20 @@ class WalletLabelsTest(BitcoinTestFramework):
             label.add_address(multisig_address)
             label.purpose[multisig_address] = "send"
             label.verify(node)
-            if accounts_api:
-                node.sendfrom("", multisig_address, 50)
         node.generate(101)
-        if accounts_api:
-            for label in labels:
-                assert_equal(node.getbalance(label.name), 50)
 
         # Check that setlabel can change the label of an address from a
         # different label.
-        change_label(node, labels[0].addresses[0], labels[0], labels[1], accounts_api)
+        change_label(node, labels[0].addresses[0], labels[0], labels[1])
 
         # Check that setlabel can set the label of an address already
         # in the label. This is a no-op.
-        change_label(node, labels[2].addresses[0], labels[2], labels[2], accounts_api)
-
-        if accounts_api:
-            # Check that setaccount can change the label of an address which
-            # is the receiving address of a different label.
-            change_label(node, labels[0].receive_address, labels[0], labels[1], accounts_api)
-
-            # Check that setaccount can set the label of an address which is
-            # already the receiving address of the label. This is a no-op.
-            change_label(node, labels[2].receive_address, labels[2], labels[2], accounts_api)
+        change_label(node, labels[2].addresses[0], labels[2], labels[2])
 
 class Label:
-    def __init__(self, name, accounts_api):
+    def __init__(self, name):
         # Label name
         self.name = name
-        self.accounts_api = accounts_api
         # Current receiving address associated with this label.
         self.receive_address = None
         # List of all addresses assigned with this label
@@ -209,56 +144,31 @@ class Label:
 
     def add_receive_address(self, address):
         self.add_address(address)
-        if self.accounts_api:
-            self.receive_address = address
 
     def verify(self, node):
         if self.receive_address is not None:
             assert self.receive_address in self.addresses
-            if self.accounts_api:
-                assert_equal(node.getaccountaddress(self.name), self.receive_address)
 
         for address in self.addresses:
             assert_equal(
                 node.getaddressinfo(address)['labels'][0],
                 {"name": self.name,
                  "purpose": self.purpose[address]})
-            if self.accounts_api:
-                assert_equal(node.getaccount(address), self.name)
-            else:
-                assert_equal(node.getaddressinfo(address)['label'], self.name)
+            assert_equal(node.getaddressinfo(address)['label'], self.name)
 
         assert_equal(
             node.getaddressesbylabel(self.name),
             {address: {"purpose": self.purpose[address]} for address in self.addresses})
-        if self.accounts_api:
-            assert_equal(set(node.getaddressesbyaccount(self.name)), set(self.addresses))
-
 
-def change_label(node, address, old_label, new_label, accounts_api):
+def change_label(node, address, old_label, new_label):
     assert_equal(address in old_label.addresses, True)
-    if accounts_api:
-        node.setaccount(address, new_label.name)
-    else:
-        node.setlabel(address, new_label.name)
+    node.setlabel(address, new_label.name)
 
     old_label.addresses.remove(address)
     new_label.add_address(address)
 
-    # Calling setaccount on an address which was previously the receiving
-    # address of a different account should reset the receiving address of
-    # the old account, causing getaccountaddress to return a brand new
-    # address.
-    if accounts_api:
-        if old_label.name != new_label.name and address == old_label.receive_address:
-            new_address = node.getaccountaddress(old_label.name)
-            assert_equal(new_address not in old_label.addresses, True)
-            assert_equal(new_address not in new_label.addresses, True)
-            old_label.add_receive_address(new_address)
-
     old_label.verify(node)
     new_label.verify(node)
 
-
 if __name__ == '__main__':
     WalletLabelsTest().main()