mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-20 09:21:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix consensus tests

Browse Source
This commit is contained in:
Igor Mandrigin 2021-03-16 12:14:35 +01:00
parent deb1528ca0
commit b8c21e9aad
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
consensus/ethash/consensus_test.go
View File

@ -101,6 +101,12 @@ func randSlice(min, max uint32) []byte {
func TestDifficultyCalculators(t *testing.T) { func TestDifficultyCalculators(t *testing.T) {
rand.Seed(2) rand.Seed(2)
wrap := func(f func(time, parentTime uint64, parentDifficulty, parentNumber *big.Int) *big.Int) func(time, parentTime uint64, parentDifficulty, parentNumber *big.Int, unkleHash common.Hash) *big.Int {
return func(time, parentTime uint64, parentDifficulty, parentNumber *big.Int, unkleHash common.Hash) *big.Int {
return f(time, parentTime, parentDifficulty, parentNumber)
}
}
for i := 0; i < 5000; i++ { for i := 0; i < 5000; i++ {
// 1 to 300 seconds diff // 1 to 300 seconds diff
var timeDelta = uint64(1 + rand.Uint32()%3000) var timeDelta = uint64(1 + rand.Uint32()%3000)
@ -119,15 +125,16 @@ func TestDifficultyCalculators(t *testing.T) {
} }
bombDelay := new(big.Int).SetUint64(rand.Uint64() % 50_000_000) bombDelay := new(big.Int).SetUint64(rand.Uint64() % 50_000_000)
for i, pair := range []struct { for i, pair := range []struct {
bigFn func(time uint64, parent *types.Header) *big.Int bigFn func(time, parentTime uint64, parentDifficulty, parentNumber *big.Int, uncleHash common.Hash) *big.Int
u256Fn func(time uint64, parent *types.Header) *big.Int u256Fn func(time uint64, parent *types.Header) *big.Int
}{ }{
{FrontierDifficultyCalulator, CalcDifficultyFrontierU256}, {wrap(FrontierDifficultyCalulator), CalcDifficultyFrontierU256},
{HomesteadDifficultyCalulator, CalcDifficultyHomesteadU256}, {wrap(HomesteadDifficultyCalulator), CalcDifficultyHomesteadU256},
{DynamicDifficultyCalculator(bombDelay), MakeDifficultyCalculatorU256(bombDelay)}, {DynamicDifficultyCalculator(bombDelay), MakeDifficultyCalculatorU256(bombDelay)},
} { } {
time := header.Time + timeDelta time := header.Time + timeDelta
want := pair.bigFn(time, header)
want := pair.bigFn(time, header.Time, header.Difficulty, header.Number, header.UncleHash)
have := pair.u256Fn(time, header) have := pair.u256Fn(time, header)
if want.BitLen() > 256 { if want.BitLen() > 256 {
continue continue
@ -153,7 +160,7 @@ func BenchmarkDifficultyCalculator(b *testing.B) {
b.Run("big-frontier", func(b *testing.B) { b.Run("big-frontier", func(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
calcDifficultyFrontier(1000014, h) calcDifficultyFrontier(1000014, h.Time, h.Difficulty, h.Number)
} }
}) })
b.Run("u256-frontier", func(b *testing.B) { b.Run("u256-frontier", func(b *testing.B) {
@ -165,7 +172,7 @@ func BenchmarkDifficultyCalculator(b *testing.B) {
b.Run("big-homestead", func(b *testing.B) { b.Run("big-homestead", func(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
calcDifficultyHomestead(1000014, h) calcDifficultyHomestead(1000014, h.Time, h.Difficulty, h.Number)
} }
}) })
b.Run("u256-homestead", func(b *testing.B) { b.Run("u256-homestead", func(b *testing.B) {
@ -177,7 +184,7 @@ func BenchmarkDifficultyCalculator(b *testing.B) {
b.Run("big-generic", func(b *testing.B) { b.Run("big-generic", func(b *testing.B) {
b.ReportAllocs() b.ReportAllocs()
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
x1(1000014, h) x1(1000014, h.Time, h.Difficulty, h.Number, h.UncleHash)
} }
}) })
b.Run("u256-generic", func(b *testing.B) { b.Run("u256-generic", func(b *testing.B) {