Merge #9020: rpc: Remove invalid explanation from wallet fee message

04c1c15 rpc: Remove invalid explanation from wallet fee message (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-10-26 13:19:44 +02:00
commit 86f9e3dbba
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -362,7 +362,7 @@ static void SendMoney(const CTxDestination &address, CAmount nValue, bool fSubtr
vecSend.push_back(recipient); vecSend.push_back(recipient);
if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) { if (!pwalletMain->CreateTransaction(vecSend, wtxNew, reservekey, nFeeRequired, nChangePosRet, strError)) {
if (!fSubtractFeeFromAmount && nValue + nFeeRequired > pwalletMain->GetBalance()) if (!fSubtractFeeFromAmount && nValue + nFeeRequired > pwalletMain->GetBalance())
strError = strprintf("Error: This transaction requires a transaction fee of at least %s because of its amount, complexity, or use of recently received funds!", FormatMoney(nFeeRequired)); strError = strprintf("Error: This transaction requires a transaction fee of at least %s", FormatMoney(nFeeRequired));
throw JSONRPCError(RPC_WALLET_ERROR, strError); throw JSONRPCError(RPC_WALLET_ERROR, strError);
} }
if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get())) if (!pwalletMain->CommitTransaction(wtxNew, reservekey, g_connman.get()))