From 273ec21a1ba63acf13d25ff51aa19f70906696e7 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Thu, 17 Nov 2016 16:43:47 +0100 Subject: [PATCH] sbft: stop new view timer on commit Change-Id: I3a5dffe673c05ec6ccc9862ffe69b54bdd9ed1b3 Signed-off-by: Simon Schubert --- orderer/sbft/simplebft/commit.go | 1 + orderer/sbft/simplebft/preprepare.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/orderer/sbft/simplebft/commit.go b/orderer/sbft/simplebft/commit.go index c9e112e4b7b..8fdb8a6aad8 100644 --- 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 index 07b0094d43e..6cbbb664dec 100644 --- 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() }