diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-10 12:53:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-05-10 12:57:07 +0200 |
| commit | 3e2c946cfdfdaae4b00793a554157762d1971705 (patch) | |
| tree | 2aa8198e0e656595ef8210a5b1463a83427a452c /src | |
| parent | f7a21dae5dbf71d5bc00485215e84e6f2b309d0a (diff) | |
| download | bitcoin-3e2c946cfdfdaae4b00793a554157762d1971705.tar.xz | |
init: Move berkeleydb version reporting to wallet
Move the version reporting to Wallet::Verify, before starting
verification of the wallet.
This removes the dependency of init on a specific wallet database
library.
A further, trivial step towards resolving #7965.
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 5 | ||||
| -rw-r--r-- | src/wallet/wallet.cpp | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/init.cpp b/src/init.cpp index b06f448a00..a46cc52a84 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -37,9 +37,7 @@ #include "utilmoneystr.h" #include "validationinterface.h" #ifdef ENABLE_WALLET -#include "wallet/db.h" #include "wallet/wallet.h" -#include "wallet/walletdb.h" #endif #include <stdint.h> #include <stdio.h> @@ -986,9 +984,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) if (fPrintToDebugLog) OpenDebugLog(); -#ifdef ENABLE_WALLET - LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); -#endif if (!fLogTimestamps) LogPrintf("Startup time: %s\n", DateTimeStrFormat("%Y-%m-%d %H:%M:%S", GetTime())); LogPrintf("Default data directory %s\n", GetDefaultDataDir().string()); diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 29d7138547..d32fe43ed8 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -368,6 +368,7 @@ void CWallet::Flush(bool shutdown) bool CWallet::Verify() { + LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); LogPrintf("Using wallet %s\n", walletFile); |