Auto merge of #4161 - oxarbitrage:issue3621, r=Eirik0
remove duplicated prefix in errors and warnings Fixes #3621
This commit is contained in:
commit
cb0a94cd21
18
src/init.cpp
18
src/init.cpp
|
@ -801,13 +801,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!SetupNetworking())
|
if (!SetupNetworking())
|
||||||
return InitError("Error: Initializing networking failed");
|
return InitError("Initializing networking failed");
|
||||||
|
|
||||||
#ifndef WIN32
|
#ifndef WIN32
|
||||||
if (GetBoolArg("-sysperms", false)) {
|
if (GetBoolArg("-sysperms", false)) {
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
if (!GetBoolArg("-disablewallet", false))
|
if (!GetBoolArg("-disablewallet", false))
|
||||||
return InitError("Error: -sysperms is not allowed in combination with enabled wallet functionality");
|
return InitError("-sysperms is not allowed in combination with enabled wallet functionality");
|
||||||
#endif
|
#endif
|
||||||
} else {
|
} else {
|
||||||
umask(077);
|
umask(077);
|
||||||
|
@ -961,16 +961,16 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
|
|
||||||
// Check for -debugnet
|
// Check for -debugnet
|
||||||
if (GetBoolArg("-debugnet", false))
|
if (GetBoolArg("-debugnet", false))
|
||||||
InitWarning(_("Warning: Unsupported argument -debugnet ignored, use -debug=net."));
|
InitWarning(_("Unsupported argument -debugnet ignored, use -debug=net."));
|
||||||
// Check for -socks - as this is a privacy risk to continue, exit here
|
// Check for -socks - as this is a privacy risk to continue, exit here
|
||||||
if (mapArgs.count("-socks"))
|
if (mapArgs.count("-socks"))
|
||||||
return InitError(_("Error: Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported."));
|
return InitError(_("Unsupported argument -socks found. Setting SOCKS version isn't possible anymore, only SOCKS5 proxies are supported."));
|
||||||
// Check for -tor - as this is a privacy risk to continue, exit here
|
// Check for -tor - as this is a privacy risk to continue, exit here
|
||||||
if (GetBoolArg("-tor", false))
|
if (GetBoolArg("-tor", false))
|
||||||
return InitError(_("Error: Unsupported argument -tor found, use -onion."));
|
return InitError(_("Unsupported argument -tor found, use -onion."));
|
||||||
|
|
||||||
if (GetBoolArg("-benchmark", false))
|
if (GetBoolArg("-benchmark", false))
|
||||||
InitWarning(_("Warning: Unsupported argument -benchmark ignored, use -debug=bench."));
|
InitWarning(_("Unsupported argument -benchmark ignored, use -debug=bench."));
|
||||||
|
|
||||||
// Checkmempool and checkblockindex default to true in regtest mode
|
// Checkmempool and checkblockindex default to true in regtest mode
|
||||||
int ratio = std::min<int>(std::max<int>(GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000);
|
int ratio = std::min<int>(std::max<int>(GetArg("-checkmempool", chainparams.DefaultConsistencyChecks() ? 1 : 0), 0), 1000000);
|
||||||
|
@ -1051,7 +1051,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
|
if (!ParseMoney(mapArgs["-paytxfee"], nFeePerK))
|
||||||
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
|
return InitError(strprintf(_("Invalid amount for -paytxfee=<amount>: '%s'"), mapArgs["-paytxfee"]));
|
||||||
if (nFeePerK > nHighTransactionFeeWarning)
|
if (nFeePerK > nHighTransactionFeeWarning)
|
||||||
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
|
InitWarning(_("-paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
|
||||||
payTxFee = CFeeRate(nFeePerK, 1000);
|
payTxFee = CFeeRate(nFeePerK, 1000);
|
||||||
if (payTxFee < ::minRelayTxFee)
|
if (payTxFee < ::minRelayTxFee)
|
||||||
{
|
{
|
||||||
|
@ -1065,7 +1065,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
|
if (!ParseMoney(mapArgs["-maxtxfee"], nMaxFee))
|
||||||
return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maptxfee"]));
|
return InitError(strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s'"), mapArgs["-maptxfee"]));
|
||||||
if (nMaxFee > nHighTransactionMaxFeeWarning)
|
if (nMaxFee > nHighTransactionMaxFeeWarning)
|
||||||
InitWarning(_("Warning: -maxtxfee is set very high! Fees this large could be paid on a single transaction."));
|
InitWarning(_("-maxtxfee is set very high! Fees this large could be paid on a single transaction."));
|
||||||
maxTxFee = nMaxFee;
|
maxTxFee = nMaxFee;
|
||||||
if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
|
if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee)
|
||||||
{
|
{
|
||||||
|
@ -1640,7 +1640,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
|
strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n";
|
||||||
else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
|
else if (nLoadWalletRet == DB_NONCRITICAL_ERROR)
|
||||||
{
|
{
|
||||||
string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data"
|
string msg(_("error reading wallet.dat! All keys read correctly, but transaction data"
|
||||||
" or address book entries might be missing or incorrect."));
|
" or address book entries might be missing or incorrect."));
|
||||||
InitWarning(msg);
|
InitWarning(msg);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue