diff options
| author | Matt Corallo <git@bluematt.me> | 2016-11-29 17:51:30 -0800 |
|---|---|---|
| committer | Matt Corallo <git@bluematt.me> | 2016-12-23 21:30:16 -0500 |
| commit | 0cf86a6678413aa03e765a7133f048df4001ff4c (patch) | |
| tree | 10846a31ea17a64d66a77f15acc182aeeea43861 /src/wallet | |
| parent | 2b5f085ad11b4b354f48d77e66698fa386c8abbd (diff) | |
Introduce (and use) an IsArgSet accessor method
Diffstat (limited to 'src/wallet')
| -rw-r--r-- | src/wallet/wallet.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index 1261aad3f2..51423f88e8 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3494,7 +3494,7 @@ bool CWallet::InitLoadWallet() walletInstance->SetBestChain(chainActive.GetLocator()); } - else if (mapArgs.count("-usehd")) { + else if (IsArgSet("-usehd")) { bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET); if (walletInstance->IsHDEnabled() && !useHD) return InitError(strprintf(_("Error loading %s: You can't disable HD on a already existing HD wallet"), walletFile)); @@ -3618,7 +3618,7 @@ bool CWallet::ParameterInteraction() InitWarning(AmountHighWarn("-minrelaytxfee") + " " + _("The wallet will avoid paying less than the minimum relay fee.")); - if (mapArgs.count("-mintxfee")) + if (IsArgSet("-mintxfee")) { CAmount n = 0; if (!ParseMoney(mapArgs["-mintxfee"], n) || 0 == n) @@ -3628,7 +3628,7 @@ bool CWallet::ParameterInteraction() _("This is the minimum transaction fee you pay on every transaction.")); CWallet::minTxFee = CFeeRate(n); } - if (mapArgs.count("-fallbackfee")) + if (IsArgSet("-fallbackfee")) { CAmount nFeePerK = 0; if (!ParseMoney(mapArgs["-fallbackfee"], nFeePerK)) @@ -3638,7 +3638,7 @@ bool CWallet::ParameterInteraction() _("This is the transaction fee you may pay when fee estimates are not available.")); CWallet::fallbackFee = CFeeRate(nFeePerK); } - if (mapArgs.count("-paytxfee")) + if (IsArgSet("-paytxfee")) { CAmount nFeePerK = 0; if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK)) @@ -3654,7 +3654,7 @@ bool CWallet::ParameterInteraction() mapArgs["-paytxfee"], ::minRelayTxFee.ToString())); } } - if (mapArgs.count("-maxtxfee")) + if (IsArgSet("-maxtxfee")) { CAmount nMaxFee = 0; if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee)) |