highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-04-24 13:59:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

init: Get rid of some ENABLE_WALLET

Browse Source
This commit is contained in:
MarcoFalke
2016-09-19 15:52:48 +02:00
parent 9ac01301f5
commit faddd62518
2 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wallet/wallet.cpp
View File

@@ -3446,6 +3446,15 @@ bool CWallet::InitLoadWallet()
bool CWallet::ParameterInteraction()
{
if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) && SoftSetBoolArg("-walletbroadcast", false)) {
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting -walletbroadcast=0\n", __func__);
}
if (GetBoolArg("-sysperms", false))
return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
if (GetArg("-prune", 0) && GetBoolArg("-rescan", false))
return InitError(_("Rescans are not possible in pruned mode. You will need to use -reindex which will download the whole blockchain again."));
if (mapArgs.count("-mintxfee"))
{
CAmount n = 0;