Merge pull request #1586 from MonsieurNicolas/scpStartBallotProtocolCB

SCP: properly trigger the startedBallotProtocol callback Reviewed-by: MonsieurNicolas
stellar · Mar 6, 2018 · 1909c07 · 1909c07
2 parents 488728d + 994460f
commit 1909c07
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/scp/BallotProtocol.cpp b/src/scp/BallotProtocol.cpp
@@ -390,7 +390,6 @@ BallotProtocol::bumpState(Value const& value, uint32 n)
 
     if (updated)
     {
-        mSlot.getSCPDriver().startedBallotProtocol(mSlot.getSlotIndex(), newb);
         emitCurrentStateStatement();
         checkHeardFromQuorum();
     }
@@ -478,6 +477,12 @@ BallotProtocol::bumpToBallot(SCPBallot const& ballot, bool check)
     bool gotBumped =
         !mCurrentBallot || (mCurrentBallot->counter != ballot.counter);
 
+    if (!mCurrentBallot)
+    {
+        mSlot.getSCPDriver().startedBallotProtocol(mSlot.getSlotIndex(),
+                                                   ballot);
+    }
+
     mCurrentBallot = make_unique<SCPBallot>(ballot);
 
     if (gotBumped)