Merge pull request #149 from getamis/feature/timeout

consensus/istanbul: set timeout correctly

Author: markya0616

consensus/istanbul/core/core.go

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