harden invariant in ballot protocol

for clarity and to avoid false negatives in static analyzer
MonsieurNicolas · Apr 1, 2022 · 97f75e8 · 97f75e8
1 parent 8e956b6
commit 97f75e8
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/src/scp/BallotProtocol.cpp b/src/scp/BallotProtocol.cpp
@@ -641,6 +641,21 @@ BallotProtocol::emitCurrentStateStatement()
 void
 BallotProtocol::checkInvariants()
 {
+    switch (mPhase)
+    {
+    case SCP_PHASE_PREPARE:
+        break;
+    case SCP_PHASE_CONFIRM:
+    case SCP_PHASE_EXTERNALIZE:
+        dbgAssert(mCurrentBallot);
+        dbgAssert(mPrepared);
+        dbgAssert(mCommit);
+        dbgAssert(mHighBallot);
+        break;
+    default:
+        dbgAbort();
+    }
+
     if (mCurrentBallot)
     {
         dbgAssert(mCurrentBallot->getBallot().counter != 0);
@@ -664,21 +679,6 @@ BallotProtocol::checkInvariants()
         dbgAssert(areBallotsLessAndCompatible(mHighBallot->getBallot(),
                                               mCurrentBallot->getBallot()));
     }
-
-    switch (mPhase)
-    {
-    case SCP_PHASE_PREPARE:
-        break;
-    case SCP_PHASE_CONFIRM:
-        dbgAssert(mCommit);
-        break;
-    case SCP_PHASE_EXTERNALIZE:
-        dbgAssert(mCommit);
-        dbgAssert(mHighBallot);
-        break;
-    default:
-        dbgAbort();
-    }
 }
 
 std::set<SCPBallot>