Remove old MESS_VER_STRMESS message version try-catch.

PIVX-Project · Jul 3, 2021 · dc0fc95 · dc0fc95
1 parent 35fca11
commit dc0fc95
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 34 deletions.
diff --git a/src/budget/budgetvote.h b/src/budget/budgetvote.h
@@ -76,12 +76,7 @@ class CBudgetVote : public CSignedMessage
             nVote = (VoteDirection) nVoteInt;
         READWRITE(nTime);
         READWRITE(vchSig);
-        try
-        {
-            READWRITE(nMessVersion);
-        } catch (...) {
-            nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        }
+        READWRITE(nMessVersion);
     }
 };
 

diff --git a/src/budget/finalizedbudgetvote.h b/src/budget/finalizedbudgetvote.h
@@ -55,12 +55,7 @@ class CFinalizedBudgetVote : public CSignedMessage
         READWRITE(nBudgetHash);
         READWRITE(nTime);
         READWRITE(vchSig);
-        try
-        {
-            READWRITE(nMessVersion);
-        } catch (...) {
-            nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        }
+        READWRITE(nMessVersion);
     }
 };
 

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -194,12 +194,7 @@ class CMasternodePaymentWinner : public CSignedMessage
         READWRITE(nBlockHeight);
         READWRITE(payee);
         READWRITE(vchSig);
-        try
-        {
-            READWRITE(nMessVersion);
-        } catch (...) {
-            nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        }
+        READWRITE(nMessVersion);
     }
 
     std::string ToString()

diff --git a/src/masternode.h b/src/masternode.h
@@ -57,12 +57,7 @@ class CMasternodePing : public CSignedMessage
         READWRITE(blockHash);
         READWRITE(sigTime);
         READWRITE(vchSig);
-        try
-        {
-            READWRITE(nMessVersion);
-        } catch (...) {
-            nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        }
+        READWRITE(nMessVersion);
     }
 
     uint256 GetHash() const;

diff --git a/src/messagesigner.h b/src/messagesigner.h
@@ -12,7 +12,7 @@
 extern const std::string strMessageMagic;
 
 enum MessageVersion {
-        MESS_VER_STRMESS    = 0,
+        MESS_VER_STRMESS    = 0, // old format
         MESS_VER_HASH       = 1,
 };
 

diff --git a/src/rpc/budget.cpp b/src/rpc/budget.cpp
@@ -742,9 +742,7 @@ UniValue mnbudgetrawvote(const JSONRPCRequest& request)
     vote.SetVchSig(vchSig);
 
     if (!vote.CheckSignature(pmn->pubKeyMasternode.GetID())) {
-        // try old message version
-        vote.nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        if (!vote.CheckSignature(pmn->pubKeyMasternode.GetID())) return "Failure to verify signature.";
+        return "Failure to verify signature.";
     }
 
     std::string strError;

diff --git a/src/spork.h b/src/spork.h
@@ -72,12 +72,7 @@ class CSporkMessage : public CSignedMessage
         READWRITE(nValue);
         READWRITE(nTimeSigned);
         READWRITE(vchSig);
-        try
-        {
-            READWRITE(nMessVersion);
-        } catch (...) {
-            nMessVersion = MessageVersion::MESS_VER_STRMESS;
-        }
+        READWRITE(nMessVersion);
     }
 };