Fixed tests.

Author: Frozen

consensus/consensus_v2.go

@@ -138,7 +138,21 @@ func (consensus *Consensus) HandleMessageUpdate(ctx context.Context, peer libp2p
 	return nil
 }
 
-func (consensus *Consensus) finalCommit(isLeader bool) {
+func (consensus *Consensus) finalCommit(waitTime time.Duration, viewID uint64, isLeader bool) {
+	consensus.getLogger().Info().Str("waitTime", waitTime.String()).
+		Msg("[OnCommit] Starting Grace Period")
+	time.Sleep(waitTime)
+	utils.Logger().Info().Msg("[OnCommit] Commit Grace Period Ended")
+
+	consensus.mutex.Lock()
+	defer consensus.mutex.Unlock()
+	consensus.transitions.finalCommit = false
+	if viewID == consensus.getCurBlockViewID() {
+		consensus._finalCommit(isLeader)
+	}
+}
+
+func (consensus *Consensus) _finalCommit(isLeader bool) {
 	numCommits := consensus.decider.SignersCount(quorum.Commit)
 
 	consensus.getLogger().Info().

consensus/leader.go

@@ -331,23 +331,13 @@ func (consensus *Consensus) onCommit(recvMsg *FBFTMessage) {
 			consensus.preCommitAndPropose(blockObj)
 		}
 
-		go func(viewID uint64, isLeader bool) {
-			waitTime := 1000 * time.Millisecond
-			maxWaitTime := time.Until(consensus.NextBlockDue) - 200*time.Millisecond
-			if maxWaitTime > waitTime {
-				waitTime = maxWaitTime
-			}
-			consensus.getLogger().Info().Str("waitTime", waitTime.String()).
-				Msg("[OnCommit] Starting Grace Period")
-			time.Sleep(waitTime)
-			logger.Info().Msg("[OnCommit] Commit Grace Period Ended")
-
-			consensus.mutex.Lock()
-			defer consensus.mutex.Unlock()
-			if viewID == consensus.getCurBlockViewID() {
-				consensus.finalCommit(isLeader)
-			}
-		}(viewID, consensus.isLeader())
+		consensus.transitions.finalCommit = true
+		waitTime := 1000 * time.Millisecond
+		maxWaitTime := time.Until(consensus.NextBlockDue) - 200*time.Millisecond
+		if maxWaitTime > waitTime {
+			waitTime = maxWaitTime
+		}
+		go consensus.finalCommit(waitTime, viewID, consensus.isLeader())
 
 		consensus.msgSender.StopRetry(msg_pb.MessageType_PREPARED)
 	}