Skip to content

Commit

Permalink
do not show error info if prepare header failed as have no ticket
Browse files Browse the repository at this point in the history
  • Loading branch information
zongyuan committed Jul 18, 2019
1 parent 24413f4 commit 3846065
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
4 changes: 3 additions & 1 deletion consensus/datong/consensus.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ var (
errInvalidUncleHash = errors.New("non empty uncle hash")

errUnauthorized = errors.New("unauthorized")

ErrNoTicket = errors.New("Miner doesn't have ticket")
)

// SignerFn is a signer callback function to request a hash to be signed by a
Expand Down Expand Up @@ -727,7 +729,7 @@ func (dt *DaTong) calcBlockDifficulty(chain consensus.ChainReader, header *types
}
}
if !haveTicket {
return nil, nil, 0, nil, fmt.Errorf("Miner doesn't have ticket at block height %v", parent.Number)
return nil, nil, 0, nil, ErrNoTicket
}
ticketsTotalAmount, numberOfticketOwners := parentTickets.NumberOfTicketsAndOwners()

Expand Down
9 changes: 8 additions & 1 deletion miner/worker.go
Original file line number Diff line number Diff line change
Expand Up @@ -788,7 +788,14 @@ func (w *worker) commitNewWork(interrupt *int32, noempty bool, timestamp int64)
header.Coinbase = w.coinbase
}
if err := w.engine.Prepare(w.chain, header); err != nil {
log.Error("Failed to prepare header for mining", "err", err)
switch err {
case datong.ErrNoTicket:
if common.DebugMode {
log.Info("Miner doesn't have ticket", "number", parent.Number)
}
default:
log.Error("Failed to prepare header for mining", "err", err)
}
return
}
// If we are care about TheDAO hard-fork check whether to override the extra-data or not
Expand Down

0 comments on commit 3846065

Please sign in to comment.