test: Remove unused options and variables, correct comments

Author: achow101

test/functional/feature_bip68_sequence.py

@@ -55,7 +55,6 @@ def set_test_params(self):
                 '-testactivationheight=csv@432',
             ],
         ]
-        self.uses_wallet = None
 
     def run_test(self):
         self.relayfee = self.nodes[0].getnetworkinfo()["relayfee"]

test/functional/rpc_rawtransaction.py

@@ -74,7 +74,6 @@ def set_test_params(self):
         # whitelist peers to speed up tx relay / mempool sync
         self.noban_tx_relay = True
         self.supports_cli = False
-        self.uses_wallet = None
 
     def setup_network(self):
         super().setup_network()

test/functional/test_framework/test_framework.py

@@ -161,7 +161,7 @@ def __init__(self, test_file) -> None:
         self.wallet_names = None
         # By default the wallet is not required. Set to true by skip_if_no_wallet().
         # Can also be set to None to indicate that the wallet will be used if available.
-        # When False or None, we ignore wallet_names regardless of what it is.
+        # When False or None, we ignore wallet_names in setup_nodes().
         self.uses_wallet = False
         # Disable ThreadOpenConnections by default, so that adding entries to
         # addrman will not result in automatic connections to them.
@@ -487,10 +487,6 @@ def init_wallet(self, *, node):
                 n.createwallet(wallet_name=wallet_name, load_on_startup=True)
             n.importprivkey(privkey=n.get_deterministic_priv_key().key, label='coinbase', rescan=True)
 
-    # Only enables wallet support when the module is available
-    def enable_wallet_if_possible(self):
-        self._requires_wallet = self.is_wallet_compiled()
-
     def run_test(self):
         """Tests must override this method to define test logic"""
         raise NotImplementedError

test/functional/test_framework/util.py

@@ -459,7 +459,6 @@ def write_config(config_path, *, n, chain, extra_config="", disable_autoconnect=
         f.write("printtoconsole=0\n")
         f.write("natpmp=0\n")
         f.write("shrinkdebugfile=0\n")
-        f.write("deprecatedrpc=create_bdb\n")  # Required to run the tests
         # To improve SQLite wallet performance so that the tests don't timeout, use -unsafesqlitesync
         f.write("unsafesqlitesync=1\n")
         if disable_autoconnect:

test/functional/test_runner.py

@@ -29,8 +29,6 @@
 import re
 import logging
 
-os.environ["REQUIRE_WALLET_TYPE_SET"] = "1"
-
 # Minimum amount of space to run the tests.
 MIN_FREE_SPACE = 1.1 * 1024 * 1024 * 1024
 # Additional space to run an extra job.

test/functional/tool_wallet.py

@@ -20,25 +20,17 @@
 
 
 class ToolWalletTest(BitcoinTestFramework):
-    def add_options(self, parser):
-        parser.add_argument("--bdbro", action="store_true", help="Use the BerkeleyRO internal parser when dumping a Berkeley DB wallet file")
-        parser.add_argument("--swap-bdb-endian", action="store_true",help="When making Legacy BDB wallets, always make then byte swapped internally")
-
     def set_test_params(self):
         self.num_nodes = 1
         self.setup_clean_chain = True
         self.rpc_timeout = 120
-        if self.options.swap_bdb_endian:
-            self.extra_args = [["-swapbdbendian"]]
 
     def skip_test_if_missing_module(self):
         self.skip_if_no_wallet()
         self.skip_if_no_wallet_tool()
 
     def bitcoin_wallet_process(self, *args):
         default_args = ['-datadir={}'.format(self.nodes[0].datadir_path), '-chain=%s' % self.chain]
-        if "dump" in args and self.options.bdbro:
-            default_args.append("-withinternalbdb")
 
         return subprocess.Popen(self.get_binaries().wallet_argv() + default_args + list(args), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
 

test/functional/wallet_createwallet.py

@@ -15,7 +15,6 @@
 
 
 EMPTY_PASSPHRASE_MSG = "Empty string given as passphrase, wallet will not be encrypted."
-LEGACY_WALLET_MSG = "Wallet created successfully. The legacy wallet type is being deprecated and support for creating and opening legacy wallets will be removed in the future."
 
 
 class CreateWalletTest(BitcoinTestFramework):
@@ -27,7 +26,6 @@ def skip_test_if_missing_module(self):
 
     def run_test(self):
         node = self.nodes[0]
-        self.generate(node, 1) # Leave IBD for sethdseed
 
         self.log.info("Run createwallet with invalid parameters.")
         # Run createwallet with invalid parameters. This must not prevent a new wallet with the same name from being created with the correct parameters.

test/functional/wallet_hd.py

@@ -43,7 +43,6 @@ def run_test(self):
 
         # This should be enough to keep the master key and the non-HD key
         self.nodes[1].backupwallet(self.nodes[1].datadir_path / "hd.bak")
-        #self.nodes[1].dumpwallet(self.nodes[1].datadir_path / "hd.dump")
 
         # Derive some HD addresses and remember the last
         # Also send funds to each add

test/functional/wallet_migration.py

@@ -47,10 +47,14 @@ def skip_test_if_missing_module(self):
         self.skip_if_no_previous_releases()
 
     def setup_nodes(self):
-        self.add_nodes(self.num_nodes, versions=[
-            None,
-            280000,
-        ])
+        self.add_nodes(
+            self.num_nodes,
+            extra_args=self.extra_args,
+            versions=[
+                None,
+                280000,
+            ],
+        )
         self.start_nodes()
         self.init_wallet(node=0)