From 70cfbfdadf16d3b115309c6938f07ef5b96c7cc1 Mon Sep 17 00:00:00 2001 From: Ava Chow Date: Tue, 2 Jan 2024 16:36:17 -0500 Subject: wallettool: Optionally use BERKELEY_RO as format when dumping BDB wallets In order to ease the transition to not having BDB, make the dump tool use DatabaseFormmat::BERKELEY_RO when -withinternalbdb is set. --- test/functional/test_runner.py | 1 + test/functional/tool_wallet.py | 3 +++ 2 files changed, 4 insertions(+) (limited to 'test') diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 3f6e47d410..89e4aa7055 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -192,6 +192,7 @@ BASE_SCRIPTS = [ 'mempool_resurrect.py', 'wallet_txn_doublespend.py --mineblock', 'tool_wallet.py --legacy-wallet', + 'tool_wallet.py --legacy-wallet --bdbro', 'tool_wallet.py --descriptors', 'tool_signet_miner.py --legacy-wallet', 'tool_signet_miner.py --descriptors', diff --git a/test/functional/tool_wallet.py b/test/functional/tool_wallet.py index fc042bca66..704f1fe9e8 100755 --- a/test/functional/tool_wallet.py +++ b/test/functional/tool_wallet.py @@ -21,6 +21,7 @@ from test_framework.util import ( class ToolWalletTest(BitcoinTestFramework): def add_options(self, parser): self.add_wallet_options(parser) + parser.add_argument("--bdbro", action="store_true", help="Use the BerkeleyRO internal parser when dumping a Berkeley DB wallet file") def set_test_params(self): self.num_nodes = 1 @@ -35,6 +36,8 @@ class ToolWalletTest(BitcoinTestFramework): default_args = ['-datadir={}'.format(self.nodes[0].datadir_path), '-chain=%s' % self.chain] if not self.options.descriptors and 'create' in args: default_args.append('-legacy') + if "dump" in args and self.options.bdbro: + default_args.append("-withinternalbdb") return subprocess.Popen([self.options.bitcoinwallet] + default_args + list(args), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True) -- cgit v1.2.3