sbft: stop new view timer on commit

corecode · Simon Schubert · commit 273ec21a1ba6 · 2016-11-22T10:46:00.000Z
Change-Id: I3a5dffe673c05ec6ccc9862ffe69b54bdd9ed1b3
Signed-off-by: Simon Schubert &lt;sis@zurich.ibm.com&gt;
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()
 	}

Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,6 @@ func (s SBFT) handleCommit(c Subject, src uint64) {`
`48`	`48`	`return`
`49`	`49`	`}`
`50`	`50`	`s.cur.commit[src] = c`
	`51`	`+ s.cancelViewChangeTimer()`
`51`	`52`	`s.maybeExecute()`
`52`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ func (s SBFT) acceptPreprepare(pp Preprepare) {`
`92`	`92`
`93`	`93`	`func (s SBFT) handleCheckedPreprepare(pp Preprepare) {`
`94`	`94`	`s.acceptPreprepare(pp)`
`95`		`- s.cancelViewChangeTimer()`
`96`	`95`	`if !s.isPrimary() {`
`97`	`96`	`s.sendPrepare()`
`98`	`97`	`}`