Skip to content

Commit 33e2b82

Browse files
committed
wallet, bench: Remove unused database options from WalletBenchLoading
1 parent 80ace04 commit 33e2b82

File tree

1 file changed

+7
-13
lines changed

1 file changed

+7
-13
lines changed

src/bench/wallet_loading.cpp

+7-13
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,16 @@
1818

1919
using wallet::CWallet;
2020
using wallet::CreateMockableWalletDatabase;
21-
using wallet::DatabaseFormat;
22-
using wallet::DatabaseOptions;
2321
using wallet::TxStateInactive;
2422
using wallet::WALLET_FLAG_DESCRIPTORS;
2523
using wallet::WalletContext;
2624
using wallet::WalletDatabase;
2725

28-
static std::shared_ptr<CWallet> BenchLoadWallet(std::unique_ptr<WalletDatabase> database, WalletContext& context, DatabaseOptions& options)
26+
static std::shared_ptr<CWallet> BenchLoadWallet(std::unique_ptr<WalletDatabase> database, WalletContext& context, uint64_t create_flags)
2927
{
3028
bilingual_str error;
3129
std::vector<bilingual_str> warnings;
32-
auto wallet = CWallet::Create(context, "", std::move(database), options.create_flags, error, warnings);
30+
auto wallet = CWallet::Create(context, "", std::move(database), create_flags, error, warnings);
3331
NotifyWalletLoaded(context, wallet);
3432
if (context.chain) {
3533
wallet->postInitProcess();
@@ -56,23 +54,19 @@ static void AddTx(CWallet& wallet)
5654
static void WalletLoading(benchmark::Bench& bench, bool legacy_wallet)
5755
{
5856
const auto test_setup = MakeNoLogFileContext<TestingSetup>();
59-
test_setup->m_args.ForceSetArg("-unsafesqlitesync", "1");
6057

6158
WalletContext context;
6259
context.args = &test_setup->m_args;
6360
context.chain = test_setup->m_node.chain.get();
6461

6562
// Setup the wallet
6663
// Loading the wallet will also create it
67-
DatabaseOptions options;
68-
if (legacy_wallet) {
69-
options.require_format = DatabaseFormat::BERKELEY;
70-
} else {
71-
options.create_flags = WALLET_FLAG_DESCRIPTORS;
72-
options.require_format = DatabaseFormat::SQLITE;
64+
uint64_t create_flags = 0;
65+
if (!legacy_wallet) {
66+
create_flags = WALLET_FLAG_DESCRIPTORS;
7367
}
7468
auto database = CreateMockableWalletDatabase();
75-
auto wallet = BenchLoadWallet(std::move(database), context, options);
69+
auto wallet = BenchLoadWallet(std::move(database), context, create_flags);
7670

7771
// Generate a bunch of transactions and addresses to put into the wallet
7872
for (int i = 0; i < 1000; ++i) {
@@ -85,7 +79,7 @@ static void WalletLoading(benchmark::Bench& bench, bool legacy_wallet)
8579
BenchUnloadWallet(std::move(wallet));
8680

8781
bench.epochs(5).run([&] {
88-
wallet = BenchLoadWallet(std::move(database), context, options);
82+
wallet = BenchLoadWallet(std::move(database), context, create_flags);
8983

9084
// Cleanup
9185
database = DuplicateMockDatabase(wallet->GetDatabase());

0 commit comments

Comments
 (0)