Remove duplicate quorum check in recvViewChange()

Change-Id: I3c7fbd94641aa6785e95573867f1fdcd3d446abd Signed-off-by: Kostas Christidis <kostas@christidis.io>
hyperledger · Aug 23, 2016 · 6f9ccaf · 6f9ccaf
1 parent 9de36e3
commit 6f9ccaf
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/consensus/pbft/viewchange.go b/consensus/pbft/viewchange.go
@@ -245,13 +245,10 @@ func (instance *pbftCore) recvViewChange(vc *ViewChange) events.Event {
 	logger.Debugf("Replica %d now has %d view change requests for view %d", instance.id, quorum, instance.view)
 
 	if !instance.activeView && vc.View == instance.view && quorum >= instance.allCorrectReplicasQuorum() {
-		if quorum >= instance.allCorrectReplicasQuorum() {
-			instance.vcResendTimer.Stop()
-			instance.startTimer(instance.lastNewViewTimeout, "new view change")
-			instance.lastNewViewTimeout = 2 * instance.lastNewViewTimeout
-			return viewChangeQuorumEvent{}
-		}
-
+		instance.vcResendTimer.Stop()
+		instance.startTimer(instance.lastNewViewTimeout, "new view change")
+		instance.lastNewViewTimeout = 2 * instance.lastNewViewTimeout
+		return viewChangeQuorumEvent{}
 	}
 
 	return nil