Skip to content

Commit 62d863f

Browse files
committed
Merge #19290: wallet: move BDB specific classes to bdb.{cpp/h}
61c1633 walletdb: Move BDB specific things into bdb.{cpp/h} (Andrew Chow) 8f03364 walletdb: moveonly: Move BerkeleyBatch Cursor and Txn funcs to cpp (Andrew Chow) 25a6557 walletdb: move IsWalletLoaded to walletdb.cpp (Andrew Chow) f6fc5f3 walletdb: Add IsBDBWalletLoaded to look for BDB wallets specifically (Andrew Chow) c3538f4 walletdb: Make SpliWalletFilePath non-static (Andrew Chow) Pull request description: Moves the BDB specific classes from db.{cpp/h} to bdb.{cpp/h}. To do this, `SplitWalletFilePath` is first made non-static. Then `IsWalletLoaded` functionality is moved to `IsBDBWalletLoaded` which is called by `IsWalletLoaded`. Then the bulk of db.{cpp/h} is moved to a new file bdb.{cpp/h}. While doing some moveonly stuff, an additional commit moves the `*Cursor` and `Txn*` implementations out of the header file and into the cpp file. Part of #18971 ACKs for top commit: laanwj: Code review ACK 61c1633 promag: Code review ACK 61c1633. meshcollider: utACK 61c1633 Tree-SHA512: cb676cd34c9cd3c838a4fef230d84711efe4cf0d2eefa64ebfd7f787ddc6f7379db0b29454874ddc46ca7ffee0f18f6f3fb96a85513cd10164048948fd03a80c
2 parents 09da0e4 + 61c1633 commit 62d863f

File tree

9 files changed

+1159
-1116
lines changed

9 files changed

+1159
-1116
lines changed

src/Makefile.am

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,7 @@ BITCOIN_CORE_H = \
240240
versionbits.h \
241241
versionbitsinfo.h \
242242
walletinitinterface.h \
243+
wallet/bdb.h \
243244
wallet/coincontrol.h \
244245
wallet/context.h \
245246
wallet/crypter.h \
@@ -350,6 +351,7 @@ libbitcoin_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
350351
libbitcoin_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
351352
libbitcoin_wallet_a_SOURCES = \
352353
interfaces/wallet.cpp \
354+
wallet/bdb.cpp \
353355
wallet/coincontrol.cpp \
354356
wallet/context.cpp \
355357
wallet/crypter.cpp \

src/qt/rpcconsole.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
#include <univalue.h>
2525

2626
#ifdef ENABLE_WALLET
27+
#include <wallet/bdb.h>
2728
#include <wallet/db.h>
2829
#include <wallet/wallet.h>
2930
#endif

0 commit comments

Comments
 (0)