Merge pull request #145 from getamis/feature/timeout

istanbul: update timeout formula

Author: markya0616

consensus/istanbul/core/core.go

@@ -316,7 +316,7 @@ func (c *core) newRoundChangeTimer() {
 	c.stopTimer()
 
 	// set timeout based on the round number
-	t := uint64(math.Pow(2, float64(c.current.Round().Uint64()))) * c.config.RequestTimeout
+	t := c.config.RequestTimeout + uint64(math.Pow(2, float64(c.current.Round().Uint64())))
 	timeout := time.Duration(t) * time.Millisecond
 	c.roundChangeTimer = time.AfterFunc(timeout, func() {
 		c.sendEvent(timeoutEvent{})

consensus/istanbul/core/handler.go

@@ -38,6 +38,7 @@ func (c *core) Start() error {
 func (c *core) Stop() error {
 	c.stopTimer()
 	c.unsubscribeEvents()
+	c.current = nil
 	return nil
 }