[refactor] Drop redundant nDoS, corruptionPossible, SetCorruptionPossible

TheBlueMatt · ajtowns · sdaftuar · commit c8b0d2269838 · 2019-05-02T15:10:32.000-04:00
Co-authored-by: Anthony Towns &lt;aj@erisian.com.au&gt;
diff --git a/src/consensus/validation.h b/src/consensus/validation.h
@@ -75,25 +75,20 @@ class CValidationState {
         MODE_ERROR,   //!< run-time error
     } mode;
     ValidationInvalidReason m_reason;
-    int nDoS;
     std::string strRejectReason;
     unsigned int chRejectCode;
-    bool corruptionPossible;
     std::string strDebugMessage;
 public:
-    CValidationState() : mode(MODE_VALID), m_reason(ValidationInvalidReason::NONE), nDoS(0), chRejectCode(0), corruptionPossible(false) {}
+    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 corruptionIn=false,
+             bool corruptionPossibleIn=false,
              const std::string &strDebugMessageIn="") {
         m_reason = reasonIn;
         chRejectCode = chRejectCodeIn;
         strRejectReason = strRejectReasonIn;
-        corruptionPossible = corruptionIn;
         strDebugMessage = strDebugMessageIn;
-        nDoS += level;
-        assert(nDoS == GetDoSForReason());
-        assert(corruptionPossible == (m_reason == ValidationInvalidReason::BLOCK_MUTATED || m_reason == ValidationInvalidReason::TX_WITNESS_MUTATED));
+        assert(corruptionPossibleIn == CorruptionPossible());
         if (mode == MODE_ERROR)
             return ret;
         mode = MODE_INVALID;
@@ -120,15 +115,9 @@ class CValidationState {
         return mode == MODE_ERROR;
     }
     bool CorruptionPossible() const {
-        assert(corruptionPossible == (m_reason == ValidationInvalidReason::BLOCK_MUTATED || m_reason == ValidationInvalidReason::TX_WITNESS_MUTATED));
-        return corruptionPossible;
+        return m_reason == ValidationInvalidReason::BLOCK_MUTATED || m_reason == ValidationInvalidReason::TX_WITNESS_MUTATED;
     }
-    void SetCorruptionPossible() {
-        corruptionPossible = true;
-        assert(corruptionPossible == (m_reason == ValidationInvalidReason::BLOCK_MUTATED || m_reason == ValidationInvalidReason::TX_WITNESS_MUTATED));
-    }
-    int GetDoS(void) const { return nDoS; }
-    int GetDoSForReason() const {
+    int GetDoS() const {
         switch (m_reason) {
         case ValidationInvalidReason::NONE:
             return 0;
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -961,7 +961,6 @@ void Misbehaving(NodeId pnode, int howmuch, const std::string& message) EXCLUSIV
 
 static bool TxRelayMayResultInDisconnect(const CValidationState& state)
 {
-    assert(state.GetDoS() == state.GetDoSForReason());
     return (state.GetDoS() > 0);
 }
 
@@ -976,7 +975,6 @@ static bool TxRelayMayResultInDisconnect(const CValidationState& state)
  * txs, the peer should not be punished. See BIP 152.
  */
 static bool MaybePunishNode(NodeId nodeid, const CValidationState& state, bool via_compact_block, const std::string& message = "") {
-    assert(state.GetDoS() == state.GetDoSForReason());
     int nDoS = state.GetDoS();
     if (nDoS > 0 && !via_compact_block) {
          LOCK(cs_main);

Original file line number	Diff line number	Diff line change
`@@ -961,7 +961,6 @@ void Misbehaving(NodeId pnode, int howmuch, const std::string& message) EXCLUSIV`
`961`	`961`
`962`	`962`	`static bool TxRelayMayResultInDisconnect(const CValidationState& state)`
`963`	`963`	`{`
`964`		`- assert(state.GetDoS() == state.GetDoSForReason());`
`965`	`964`	`return (state.GetDoS() > 0);`
`966`	`965`	`}`
`967`	`966`
`@@ -976,7 +975,6 @@ static bool TxRelayMayResultInDisconnect(const CValidationState& state)`
`976`	`975`	`* txs, the peer should not be punished. See BIP 152.`
`977`	`976`	`*/`
`978`	`977`	`static bool MaybePunishNode(NodeId nodeid, const CValidationState& state, bool via_compact_block, const std::string& message = "") {`
`979`		`- assert(state.GetDoS() == state.GetDoSForReason());`
`980`	`978`	`int nDoS = state.GetDoS();`
`981`	`979`	`if (nDoS > 0 && !via_compact_block) {`
`982`	`980`	`LOCK(cs_main);`