Merge 3544e44 into 4c5ac64

consensus/miner/worker.go

@@ -257,11 +257,11 @@ func (worker *Worker) setExtra(extra []byte) {
 
 func (worker *Worker) commitNewWork(timestamp int64, parent *types.Header, quit chan struct{}) (*types.Block, error) {
 	dpos := worker.Engine().(*dpos.Dpos)
-	if time.Now().UnixNano() >= timestamp+int64(dpos.BlockInterval()) {
-		return nil, errors.New("mint the ingore block")
+	if t := time.Now().UnixNano(); t >= timestamp+int64(dpos.BlockInterval()) {
+		return nil, fmt.Errorf("mint the ingore block, need %v, now %v", timestamp, t)
 	}
 	if parent.Time.Int64() >= timestamp {
-		return nil, errors.New("mint the future block")
+		return nil, errors.New("mint the old block")
 	}
 	// if dpos.IsFirst(uint64(timestamp)) && parent.Time.Int64() != timestamp-int64(dpos.BlockInterval()) && timestamp-time.Now().UnixNano() >= int64(dpos.BlockInterval())/10 {
 	if parent.Number.Uint64() > 0 &&
@@ -470,18 +470,18 @@ type Work struct {
 	quit            chan struct{}
 }
 
-func (worker *Worker) usleep(duration time.Duration) {
+func (worker *Worker) usleep(duration time.Duration) time.Time {
 	end := time.Now().Add(duration)
 	for {
-		time.Sleep(time.Microsecond)
+		time.Sleep(time.Millisecond)
 		if time.Now().Sub(end) >= 0 {
 			break
 		}
 	}
+	return end
 }
 func (worker *Worker) utimer(duration time.Duration, c chan time.Time) {
 	go func(c chan time.Time) {
-		worker.usleep(duration)
-		c <- time.Now()
+		c <- worker.usleep(duration)
 	}(c)
 }