Merge #13138: [tests] Remove accounts from wallet_importprunedfunds.py

38040c34e1 [tests] Remove accounts from wallet_importprunedfunds.py (John Newbery)

Pull request description:

  This was split from #13075 to not block review/merge of that PR.

Tree-SHA512: 631d7139ed2bda5222ec395cc75720261e2e1f741dba04723d09fe04ef6cf92222a3679d886026ec33e2db2d1e2fa1a0f36c2451581d0f733a9939a98c7118ab

1 files changed, 9 insertions, 16 deletions

diff --git a/test/functional/wallet_importprunedfunds.py b/test/functional/wallet_importprunedfunds.py
index 9cee9aa49a..256901884b 100755
--- a/test/functional/wallet_importprunedfunds.py
+++ b/test/functional/wallet_importprunedfunds.py
@@ -15,7 +15,6 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
     def set_test_params(self):
         self.setup_clean_chain = True
         self.num_nodes = 2
-        self.extra_args = [['-deprecatedrpc=accounts']] * 2
 
     def run_test(self):
         self.log.info("Mining blocks...")
@@ -74,22 +73,20 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
         # Import with no affiliated address
         assert_raises_rpc_error(-5, "No addresses", self.nodes[1].importprunedfunds, rawtxn1, proof1)
 
-        balance1 = self.nodes[1].getbalance("", 0, True)
+        balance1 = self.nodes[1].getbalance()
         assert_equal(balance1, Decimal(0))
 
         # Import with affiliated address with no rescan
-        self.nodes[1].importaddress(address2, "add2", False)
+        self.nodes[1].importaddress(address=address2, rescan=False)
         self.nodes[1].importprunedfunds(rawtxn2, proof2)
-        balance2 = self.nodes[1].getbalance("add2", 0, True)
-        assert_equal(balance2, Decimal('0.05'))
+        assert [tx for tx in self.nodes[1].listtransactions(include_watchonly=True) if tx['txid'] == txnid2]
 
         # Import with private key with no rescan
-        self.nodes[1].importprivkey(privkey=address3_privkey, label="add3", rescan=False)
+        self.nodes[1].importprivkey(privkey=address3_privkey, rescan=False)
         self.nodes[1].importprunedfunds(rawtxn3, proof3)
-        balance3 = self.nodes[1].getbalance("add3", 0, False)
+        assert [tx for tx in self.nodes[1].listtransactions() if tx['txid'] == txnid3]
+        balance3 = self.nodes[1].getbalance()
         assert_equal(balance3, Decimal('0.025'))
-        balance3 = self.nodes[1].getbalance("*", 0, True)
-        assert_equal(balance3, Decimal('0.075'))
 
         # Addresses Test - after import
         address_info = self.nodes[1].getaddressinfo(address1)
@@ -104,17 +101,13 @@ class ImportPrunedFundsTest(BitcoinTestFramework):
 
         # Remove transactions
         assert_raises_rpc_error(-8, "Transaction does not exist in wallet.", self.nodes[1].removeprunedfunds, txnid1)
-
-        balance1 = self.nodes[1].getbalance("*", 0, True)
-        assert_equal(balance1, Decimal('0.075'))
+        assert not [tx for tx in self.nodes[1].listtransactions(include_watchonly=True) if tx['txid'] == txnid1]
 
         self.nodes[1].removeprunedfunds(txnid2)
-        balance2 = self.nodes[1].getbalance("*", 0, True)
-        assert_equal(balance2, Decimal('0.025'))
+        assert not [tx for tx in self.nodes[1].listtransactions(include_watchonly=True) if tx['txid'] == txnid2]
 
         self.nodes[1].removeprunedfunds(txnid3)
-        balance3 = self.nodes[1].getbalance("*", 0, True)
-        assert_equal(balance3, Decimal('0.0'))
+        assert not [tx for tx in self.nodes[1].listtransactions(include_watchonly=True) if tx['txid'] == txnid3]
 
 if __name__ == '__main__':
     ImportPrunedFundsTest().main()