FAB-1192 timer should be reset each pop

https://jira.hyperledger.org/browse/FAB-1192

Missing timer reset causes broadcast transactions to
be not cut into blocks.

Change-Id: Id6efbd18e307d43889a3703503305d3ee46bd6a1
Signed-off-by: Srinivasan Muralidharan <[email protected]>

Author: Srinivasan Muralidharan

orderer/solo/consensus.go

@@ -24,7 +24,6 @@ import (
 	"github.com/hyperledger/fabric/orderer/common/configtx"
 	"github.com/hyperledger/fabric/orderer/rawledger"
 	cb "github.com/hyperledger/fabric/protos/common"
-
 	"github.com/op/go-logging"
 )
 
@@ -88,6 +87,9 @@ func (bs *consenter) main() {
 				bs.rl.Append(batch, nil)
 			}
 		case <-timer:
+			//clear the timer
+			timer = nil
+
 			batch := bs.cutter.Cut()
 			if len(batch) == 0 {
 				logger.Warningf("Batch timer expired with no pending requests, this might indicate a bug")