From 5e78c5734bb0c9aae7b0a7019a745b2d7059b3d9 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Sun, 20 Jan 2019 13:21:55 +1000 Subject: Allow use of state.Invalid() for all reasons Co-authored-by: Anthony Towns --- src/consensus/validation.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/consensus') diff --git a/src/consensus/validation.h b/src/consensus/validation.h index a18739135f..9583e61056 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -84,21 +84,23 @@ public: unsigned int chRejectCodeIn=0, const std::string &strRejectReasonIn="", bool corruptionPossibleIn=false, const std::string &strDebugMessageIn="") { + ret = Invalid(reasonIn, ret, chRejectCodeIn, strRejectReasonIn, strDebugMessageIn); + assert(level == GetDoS()); + assert(corruptionPossibleIn == CorruptionPossible()); + return ret; + } + bool Invalid(ValidationInvalidReason reasonIn, bool ret = false, + unsigned int chRejectCodeIn=0, const std::string &strRejectReasonIn="", + const std::string &strDebugMessageIn="") { m_reason = reasonIn; chRejectCode = chRejectCodeIn; strRejectReason = strRejectReasonIn; strDebugMessage = strDebugMessageIn; - assert(corruptionPossibleIn == CorruptionPossible()); if (mode == MODE_ERROR) return ret; mode = MODE_INVALID; return ret; } - bool Invalid(ValidationInvalidReason _reason, bool ret = false, - unsigned int _chRejectCode=0, const std::string &_strRejectReason="", - const std::string &_strDebugMessage="") { - return DoS(0, _reason, ret, _chRejectCode, _strRejectReason, false, _strDebugMessage); - } bool Error(const std::string& strRejectReasonIn) { if (mode == MODE_VALID) strRejectReason = strRejectReasonIn; -- cgit v1.2.3