Skip to content

consensus/ethash: fix a typo and error message #20503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2020
Merged

consensus/ethash: fix a typo and error message #20503

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc052a1
consensus/ethash: fix a typo and error message
gballet Jan 3, 2020
1448b95
consensus/ethash: update error message
fjl Jan 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions consensus/ethash/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ var (
// codebase, inherently breaking if the engine is swapped out. Please put common
// error types into the consensus package.
var (
errZeroBlockTime = errors.New("timestamp equals parent's")
errOlderBlockTime = errors.New("header timestamp is older or same as parent's")
Copy link
Member

@karalabe karalabe Jan 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps timestamp older than parent. I know it's not as precise, but I kind of prefer shorter errors than long winded wording that doesn't add significantly more information.

Copy link
Contributor

@fjl fjl Jan 7, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated

errTooManyUncles = errors.New("too many uncles")
errDuplicateUncle = errors.New("duplicate uncle")
errUncleIsAncestor = errors.New("uncle is ancestor")
Expand Down Expand Up @@ -255,9 +255,9 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainReader, header, parent *
}
}
if header.Time <= parent.Time {
return errZeroBlockTime
return errOlderBlockTime
}
// Verify the block's difficulty based in its timestamp and parent's difficulty
// Verify the block's difficulty based on its timestamp and parent's difficulty
expected := ethash.CalcDifficulty(chain, header.Time, parent)

if expected.Cmp(header.Difficulty) != 0 {
Expand Down