From 12dbdd7a41bac73e51ed8f7b290b7671196bf9ea Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 18 Jan 2019 12:59:02 +1000 Subject: [PATCH] [refactor] Drop unused state.DoS(), state.GetDoS(), state.CorruptionPossible() Co-authored-by: Anthony Towns --- src/consensus/validation.h | 40 ++------------------------------------ 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/src/consensus/validation.h b/src/consensus/validation.h index 9583e6105..ed1b04761 100644 --- a/src/consensus/validation.h +++ b/src/consensus/validation.h @@ -80,18 +80,9 @@ private: std::string strDebugMessage; public: CValidationState() : mode(MODE_VALID), m_reason(ValidationInvalidReason::NONE), chRejectCode(0) {} - bool DoS(int level, ValidationInvalidReason reasonIn, bool ret = false, - 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="") { + unsigned int chRejectCodeIn=0, const std::string &strRejectReasonIn="", + const std::string &strDebugMessageIn="") { m_reason = reasonIn; chRejectCode = chRejectCodeIn; strRejectReason = strRejectReasonIn; @@ -116,33 +107,6 @@ public: bool IsError() const { return mode == MODE_ERROR; } - bool CorruptionPossible() const { - return m_reason == ValidationInvalidReason::BLOCK_MUTATED || m_reason == ValidationInvalidReason::TX_WITNESS_MUTATED; - } - int GetDoS() const { - switch (m_reason) { - case ValidationInvalidReason::NONE: - return 0; - case ValidationInvalidReason::CONSENSUS: - case ValidationInvalidReason::BLOCK_MUTATED: - case ValidationInvalidReason::BLOCK_INVALID_HEADER: - case ValidationInvalidReason::BLOCK_CHECKPOINT: - case ValidationInvalidReason::BLOCK_INVALID_PREV: - return 100; - case ValidationInvalidReason::BLOCK_MISSING_PREV: - return 10; - case ValidationInvalidReason::CACHED_INVALID: - case ValidationInvalidReason::RECENT_CONSENSUS_CHANGE: - case ValidationInvalidReason::BLOCK_TIME_FUTURE: - case ValidationInvalidReason::TX_NOT_STANDARD: - case ValidationInvalidReason::TX_MISSING_INPUTS: - case ValidationInvalidReason::TX_WITNESS_MUTATED: - case ValidationInvalidReason::TX_CONFLICT: - case ValidationInvalidReason::TX_MEMPOOL_POLICY: - return 0; - } - return 0; - } ValidationInvalidReason GetReason() const { return m_reason; } unsigned int GetRejectCode() const { return chRejectCode; } std::string GetRejectReason() const { return strRejectReason; }