From a29a5345a1548eadcc32d992ce225388e1781609 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Fri, 16 Sep 2016 21:16:22 +0400 Subject: [PATCH] remove deprecated keysLoaded, fSucessfullyLoaded, strBudgetMode (#1027) --- src/init.cpp | 5 ----- src/util.cpp | 2 -- src/util.h | 9 +++------ 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index edb7559cd..23f73b806 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -559,7 +559,6 @@ std::string HelpMessage(HelpMessageMode mode) strUsage += HelpMessageOpt("-mnconflock=", strprintf(_("Lock masternodes from masternode configuration file (default: %u)"), 1)); strUsage += HelpMessageOpt("-masternodeprivkey=", _("Set the masternode private key")); strUsage += HelpMessageOpt("-masternodeaddr=", strprintf(_("Set external address:port to get to this masternode (example: %s)"), "128.127.106.235:9999")); - strUsage += HelpMessageOpt("-budgetvotemode=", _("Change automatic finalized budget voting behavior. mode=auto: Vote for only exact finalized budget match to my generated budget. (string, default: auto)")); strUsage += HelpMessageGroup(_("PrivateSend options:")); strUsage += HelpMessageOpt("-enableprivatesend=", strprintf(_("Enable use of automated PrivateSend for funds stored in this wallet (0-1, default: %u)"), 0)); @@ -1808,9 +1807,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) } } - //get the mode of budget voting for this masternode - strBudgetMode = GetArg("-budgetvotemode", "auto"); - if(GetBoolArg("-mnconflock", true) && pwalletMain) { LOCK(pwalletMain->cs_wallet); LogPrintf("Locking Masternodes:\n"); @@ -1855,7 +1851,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler) LogPrintf("nInstantSendDepth %d\n", nInstantSendDepth); LogPrintf("PrivateSend rounds %d\n", nPrivateSendRounds); LogPrintf("PrivateSend amount %d\n", nPrivateSendAmount); - LogPrintf("Budget Mode %s\n", strBudgetMode); darkSendPool.InitDenominations(); mnodeman.InitDummyScriptPubkey(); diff --git a/src/util.cpp b/src/util.cpp index e856d9556..806b5359b 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -113,8 +113,6 @@ bool fLiteMode = false; -2 - disabled because wallet was locked and we were not able to replenish keypool */ int nWalletBackups = 10; -bool fSucessfullyLoaded = false; -string strBudgetMode = ""; const char * const BITCOIN_CONF_FILENAME = "dash.conf"; const char * const BITCOIN_PID_FILENAME = "dashd.pid"; diff --git a/src/util.h b/src/util.h index c581eb2a9..fb17c4509 100644 --- a/src/util.h +++ b/src/util.h @@ -46,13 +46,10 @@ extern bool fMasterNode; extern bool fLiteMode; extern int nWalletBackups; -extern int keysLoaded; -extern bool fSucessfullyLoaded; -extern std::string strBudgetMode; -static const bool DEFAULT_LOGTIMEMICROS = false; -static const bool DEFAULT_LOGIPS = false; -static const bool DEFAULT_LOGTIMESTAMPS = true; +static const bool DEFAULT_LOGTIMEMICROS = false; +static const bool DEFAULT_LOGIPS = false; +static const bool DEFAULT_LOGTIMESTAMPS = true; static const bool DEFAULT_LOGTHREADNAMES = false; /** Signals for translation. */