mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-06-12 15:49:31 +02:00
Merge #20202: wallet: Make BDB support optional
d52f502b1eFix mock SQLiteDatabases (Andrew Chow)99309ab3e9Allow disabling BDB in configure with --without-bdb (Andrew Chow)ee47f11f73GUI: Force descriptor wallets when BDB is not compiled (Andrew Chow)71e40b33bdRPC: Require descriptors=True for createwallet when BDB is not compiled (Andrew Chow)6ebc41bf9cEnforce salvage is only for BDB wallets (Andrew Chow)a58b719cf7Do not compile BDB things when USE_BDB is defined (Andrew Chow)b33af48210Include wallet/bdb.h where it is actually being used (Andrew Chow) Pull request description: Adds a `--without-bdb` option to `configure` which disables the compilation of the BDB stuff. Legacy wallets will not be created when BDB is not compiled. A legacy-sqlite wallet can be loaded, but we will not create them. Based on #20156 to resolve the situation where both `--without-sqlite` and `--without-bdb` are provided. In that case, the wallet is disabled and `--disable-wallet` is effectively set. ACKs for top commit: laanwj: Code review ACKd52f502b1eTree-SHA512: 5a92ba7a542acc2e27003e9d4e5940e0d02d5c1f110db06cdcab831372bfd83e8d89c269caff31dd5bff062c1cf5f04683becff12bd23a33be731676f346553d
This commit is contained in:
@@ -292,7 +292,6 @@ BITCOIN_TESTS =\
|
||||
|
||||
if ENABLE_WALLET
|
||||
BITCOIN_TESTS += \
|
||||
wallet/test/db_tests.cpp \
|
||||
wallet/test/psbt_wallet_tests.cpp \
|
||||
wallet/test/wallet_tests.cpp \
|
||||
wallet/test/walletdb_tests.cpp \
|
||||
@@ -302,6 +301,10 @@ BITCOIN_TESTS += \
|
||||
wallet/test/ismine_tests.cpp \
|
||||
wallet/test/scriptpubkeyman_tests.cpp
|
||||
|
||||
if USE_BDB
|
||||
BITCOIN_TESTS += wallet/test/db_tests.cpp
|
||||
endif
|
||||
|
||||
BITCOIN_TEST_SUITE += \
|
||||
wallet/test/wallet_test_fixture.cpp \
|
||||
wallet/test/wallet_test_fixture.h \
|
||||
|
||||
Reference in New Issue
Block a user