sbft: stop new view timer on commit

Change-Id: I3a5dffe673c05ec6ccc9862ffe69b54bdd9ed1b3 Signed-off-by: Simon Schubert <[email protected]>
hyperledger · Nov 22, 2016 · 273ec21 · 273ec21
1 parent 6d53b1e
commit 273ec21
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/orderer/sbft/simplebft/commit.go b/orderer/sbft/simplebft/commit.go
@@ -48,5 +48,6 @@ func (s *SBFT) handleCommit(c *Subject, src uint64) {
 		return
 	}
 	s.cur.commit[src] = c
+	s.cancelViewChangeTimer()
 	s.maybeExecute()
 }
diff --git a/orderer/sbft/simplebft/preprepare.go b/orderer/sbft/simplebft/preprepare.go
@@ -92,7 +92,6 @@ func (s *SBFT) acceptPreprepare(pp *Preprepare) {
 
 func (s *SBFT) handleCheckedPreprepare(pp *Preprepare) {
 	s.acceptPreprepare(pp)
-	s.cancelViewChangeTimer()
 	if !s.isPrimary() {
 		s.sendPrepare()
 	}