diff options
| author | MarcoFalke <[email protected]> | 2016-09-19 16:09:38 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2016-09-20 17:32:05 +0200 |
| commit | fab91070d38aa248a852e04c56dcb73e4022872d (patch) | |
| tree | 7803823646f7ade7f419853296ab8edb121e8e59 /src/wallet/wallet.cpp | |
| parent | Merge #8739: [qa] Fix broken sendcmpct test in p2p-compactblocks.py (diff) | |
| download | discoin-fab91070d38aa248a852e04c56dcb73e4022872d.tar.xz discoin-fab91070d38aa248a852e04c56dcb73e4022872d.zip | |
init: Get rid of fDisableWallet
Diffstat (limited to 'src/wallet/wallet.cpp')
| -rw-r--r-- | src/wallet/wallet.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 7469fd751..27dd4c0a9 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -414,6 +414,9 @@ void CWallet::Flush(bool shutdown) bool CWallet::Verify() { + if (GetBoolArg("-disablewallet", false)) + return true; + LogPrintf("Using BerkeleyDB version %s\n", DbEnv::version(0, 0, 0)); std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); @@ -3293,6 +3296,12 @@ std::string CWallet::GetWalletHelpString(bool showDebug) bool CWallet::InitLoadWallet() { + if (GetBoolArg("-disablewallet", false)) { + pwalletMain = NULL; + LogPrintf("Wallet disabled!\n"); + return true; + } + std::string walletFile = GetArg("-wallet", DEFAULT_WALLET_DAT); // needed to restore wallet transaction meta data after -zapwallettxes @@ -3464,6 +3473,9 @@ bool CWallet::InitLoadWallet() bool CWallet::ParameterInteraction() { + if (GetBoolArg("-disablewallet", false)) + return true; + if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) { LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__); } |