diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-24 12:40:27 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-24 12:40:39 +0100 |
| commit | eef8a67abfe1453cd41270a071a8ada464208168 (patch) | |
| tree | b0b05fd08aee136c1393b381000307cbcb824412 /src | |
| parent | be5d37c59757ac3b6deae1e3b238dcb2168207cb (diff) | |
| parent | 848fe68acdfbf9e046430e92e314159cecf8eb1e (diff) | |
| download | bitcoin-eef8a67abfe1453cd41270a071a8ada464208168.tar.xz | |
Merge pull request #3300
848fe68 cleanup error message consistency (Julian Langschaedel)
Diffstat (limited to 'src')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index c4d58f970d..705e94fabb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -552,7 +552,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state) REJECT_INVALID, "vout empty"); // Size limits 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"); // Check for negative or overflow output values @@ -567,7 +567,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state) REJECT_INVALID, "vout too large"); nValueOut += txout.nValue; 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"); } @@ -576,7 +576,7 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state) BOOST_FOREACH(const CTxIn& txin, tx.vin) { 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"); vInOutPoints.insert(txin.prevout); } |