Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
JoelKatz
2012-12-27 10:41:45 -08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -39,7 +39,7 @@ bool transResultInfo(TER terCode, std::string& strToken, std::string& strHuman)
{ temMALFORMED, "temMALFORMED", "Malformed transaction." },
{ temBAD_AMOUNT, "temBAD_AMOUNT", "Can only send positive amounts." },
{ temBAD_AUTH_MASTER, "temBAD_AUTH_MASTER", "Auth for unclaimed account needs correct master key." },
{ temBAD_FEE, "temBAD_FEE", "Negative fee." },
{ temBAD_FEE, "temBAD_FEE", "Invalid fee, negative or not XRP." },
{ temBAD_EXPIRATION, "temBAD_EXPIRATION", "Malformed." },
{ temBAD_ISSUER, "temBAD_ISSUER", "Malformed." },
{ temBAD_LIMIT, "temBAD_LIMIT", "Limits must be non-negative." },

View File

@@ -63,7 +63,7 @@ TER Transactor::payFee()
}
if (saPaid.isNegative() || !saPaid.isNative())
return temBAD_AMOUNT;
return temBAD_FEE;
if (!saPaid) return tesSUCCESS;