Merge pull request #3300

848fe68 cleanup error message consistency (Julian Langschaedel)
This commit is contained in:
Wladimir J. van der Laan 2013-11-24 12:40:27 +01:00
commit eef8a67abf
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6

View File

@ -552,7 +552,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
REJECT_INVALID, "vout empty"); REJECT_INVALID, "vout empty");
// Size limits // Size limits
if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE) if (::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
return state.DoS(100, error("CTransaction::CheckTransaction() : size limits failed"), return state.DoS(100, error("CheckTransaction() : size limits failed"),
REJECT_INVALID, "oversize"); REJECT_INVALID, "oversize");
// Check for negative or overflow output values // Check for negative or overflow output values
@ -567,7 +567,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
REJECT_INVALID, "vout too large"); REJECT_INVALID, "vout too large");
nValueOut += txout.nValue; nValueOut += txout.nValue;
if (!MoneyRange(nValueOut)) if (!MoneyRange(nValueOut))
return state.DoS(100, error("CTransaction::CheckTransaction() : txout total out of range"), return state.DoS(100, error("CheckTransaction() : txout total out of range"),
REJECT_INVALID, "txout total too large"); REJECT_INVALID, "txout total too large");
} }
@ -576,7 +576,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
BOOST_FOREACH(const CTxIn& txin, tx.vin) BOOST_FOREACH(const CTxIn& txin, tx.vin)
{ {
if (vInOutPoints.count(txin.prevout)) if (vInOutPoints.count(txin.prevout))
return state.DoS(100, error("CTransaction::CheckTransaction() : duplicate inputs"), return state.DoS(100, error("CheckTransaction() : duplicate inputs"),
REJECT_INVALID, "duplicate inputs"); REJECT_INVALID, "duplicate inputs");
vInOutPoints.insert(txin.prevout); vInOutPoints.insert(txin.prevout);
} }