fix reset timer

plugin/consensus/dpos/consensus_state.go

@@ -193,14 +193,11 @@ func (cs *ConsensusState) Stop() {
 // Attempt to reset the timer
 func (cs *ConsensusState) resetTimer(duration time.Duration, stateType int) {
 	dposlog.Info("set timer", "duration", duration, "state", StateTypeMapping[stateType])
-	cs.timer.Reset(duration)
-}
-
-// Attempt to reset the timer
-func (cs *ConsensusState) stopAndResetTimer(duration time.Duration, stateType int) {
-	dposlog.Info("set timer", "duration", duration, "state", StateTypeMapping[stateType])
 	if !cs.timer.Stop() {
-		<-cs.timer.C
+		select {
+		case <-cs.timer.C:
+		default:
+		}
 	}
 	cs.timer.Reset(duration)
 }

plugin/consensus/dpos/state_machine.go

@@ -529,7 +529,7 @@ func (voting *VotingState) recvVote(cs *ConsensusState, vote *dpostype.DPosVote)
 			}
 		}
 		//1s后检查是否出块，是否需要重新投票
-		cs.stopAndResetTimer(time.Millisecond*500, VotedStateType)
+		cs.resetTimer(time.Millisecond*500, VotedStateType)
 	} else if result == continueToVote {
 		dposlog.Info("VotingState get a vote, but don't get an agreement,waiting for new votes...")
 	} else {
@@ -538,7 +538,7 @@ func (voting *VotingState) recvVote(cs *ConsensusState, vote *dpostype.DPosVote)
 		cs.ClearVotes()
 		cs.SetState(InitStateObj)
 		dposlog.Info("Change state because of vote failed.", "from", "VotingState", "to", "InitState")
-		cs.stopAndResetTimer(time.Duration(timeoutCheckConnections)*time.Millisecond, InitStateType)
+		cs.resetTimer(time.Duration(timeoutCheckConnections)*time.Millisecond, InitStateType)
 	}
 }
 
@@ -776,7 +776,7 @@ func (voted *VotedState) recvNotify(cs *ConsensusState, notify *dpostype.DPosNot
 	cs.ClearVotes()
 	cs.SetState(WaitNotifyStateObj)
 	dposlog.Info("Change state because of recv notify.", "from", "VotedState", "to", "WaitNotifyState")
-	cs.stopAndResetTimer(time.Duration(timeoutWaitNotify)*time.Millisecond, WaitNotifyStateType)
+	cs.resetTimer(time.Duration(timeoutWaitNotify)*time.Millisecond, WaitNotifyStateType)
 	if cs.cachedNotify != nil {
 		cs.dposState.recvNotify(cs, cs.cachedNotify)
 	}