cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +6 -6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a52bcccfe1 - Show all commits

4
consensus/ethash/consensus.go
View File

@ -507,8 +507,8 @@ func calcDifficultyFrontier(time uint64, parent *types.Header) *big.Int {
} }
// Exported for fuzzing // Exported for fuzzing
var FrontierDifficultyCalulator = calcDifficultyFrontier var FrontierDifficultyCalculator = calcDifficultyFrontier
var HomesteadDifficultyCalulator = calcDifficultyHomestead var HomesteadDifficultyCalculator = calcDifficultyHomestead
var DynamicDifficultyCalculator = makeDifficultyCalculator var DynamicDifficultyCalculator = makeDifficultyCalculator
// verifySeal checks whether a block satisfies the PoW difficulty requirements, // verifySeal checks whether a block satisfies the PoW difficulty requirements,

4
consensus/ethash/consensus_test.go
View File

@ -121,8 +121,8 @@ func TestDifficultyCalculators(t *testing.T) {
bigFn func(time uint64, parent *types.Header) *big.Int bigFn func(time uint64, parent *types.Header) *big.Int
u256Fn func(time uint64, parent *types.Header) *big.Int u256Fn func(time uint64, parent *types.Header) *big.Int
}{ }{
{FrontierDifficultyCalulator, CalcDifficultyFrontierU256}, {FrontierDifficultyCalculator, CalcDifficultyFrontierU256},
{HomesteadDifficultyCalulator, CalcDifficultyHomesteadU256}, {HomesteadDifficultyCalculator, CalcDifficultyHomesteadU256},
{DynamicDifficultyCalculator(bombDelay), MakeDifficultyCalculatorU256(bombDelay)}, {DynamicDifficultyCalculator(bombDelay), MakeDifficultyCalculatorU256(bombDelay)},
} { } {
time := header.Time + timeDelta time := header.Time + timeDelta

4
tests/fuzzers/difficulty/difficulty-fuzz.go
View File

@ -130,8 +130,8 @@ func (f *fuzzer) fuzz() int {
bigFn calculator bigFn calculator
u256Fn calculator u256Fn calculator
}{ }{
{ethash.FrontierDifficultyCalulator, ethash.CalcDifficultyFrontierU256}, {ethash.FrontierDifficultyCalculator, ethash.CalcDifficultyFrontierU256},
{ethash.HomesteadDifficultyCalulator, ethash.CalcDifficultyHomesteadU256}, {ethash.HomesteadDifficultyCalculator, ethash.CalcDifficultyHomesteadU256},
{ethash.DynamicDifficultyCalculator(bombDelay), ethash.MakeDifficultyCalculatorU256(bombDelay)}, {ethash.DynamicDifficultyCalculator(bombDelay), ethash.MakeDifficultyCalculatorU256(bombDelay)},
} { } {
want := pair.bigFn(time, header) want := pair.bigFn(time, header)