Skip to content

Commit

Permalink
trie: reduce unit test time (ethereum#26918)
Browse files Browse the repository at this point in the history
  • Loading branch information
MariusVanDerWijden authored and mmsqe committed Dec 7, 2023
1 parent a6e1038 commit 5a0db3f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 9 deletions.
25 changes: 19 additions & 6 deletions trie/proof_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"bytes"
crand "crypto/rand"
"encoding/binary"
"fmt"
mrand "math/rand"
"sort"
"testing"
Expand All @@ -30,6 +31,24 @@ import (
"github.com/ethereum/go-ethereum/ethdb/memorydb"
)

// Prng is a pseudo random number generator seeded by strong randomness.
// The randomness is printed on startup in order to make failures reproducible.
var prng = initRnd()

func initRnd() *mrand.Rand {
var seed [8]byte
crand.Read(seed[:])
rnd := mrand.New(mrand.NewSource(int64(binary.LittleEndian.Uint64(seed[:]))))
fmt.Printf("Seed: %x\n", seed)
return rnd
}

func randBytes(n int) []byte {
r := make([]byte, n)
prng.Read(r)
return r
}

// makeProvers creates Merkle trie provers based on different implementations to
// test all variations.
func makeProvers(trie *Trie) []func(key []byte) *memorydb.Database {
Expand Down Expand Up @@ -1041,12 +1060,6 @@ func randomTrie(n int) (*Trie, map[string]*kv) {
return trie, vals
}

func randBytes(n int) []byte {
r := make([]byte, n)
crand.Read(r)
return r
}

func nonRandomTrie(n int) (*Trie, map[string]*kv) {
trie := NewEmpty(NewDatabase(rawdb.NewMemoryDatabase()))
vals := make(map[string]*kv)
Expand Down
1 change: 1 addition & 0 deletions trie/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -434,6 +434,7 @@ func TestDuplicateAvoidanceSync(t *testing.T) {
// Tests that at any point in time during a sync, only complete sub-tries are in
// the database.
func TestIncompleteSync(t *testing.T) {
t.Parallel()
// Create a random trie to copy
srcDb, srcTrie, _ := makeTestTrie()

Expand Down
6 changes: 3 additions & 3 deletions trie/trie_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ package trie

import (
"bytes"
crand "crypto/rand"
"encoding/binary"
"errors"
"fmt"
Expand Down Expand Up @@ -1146,13 +1145,14 @@ func deleteString(trie *Trie, k string) {

func TestDecodeNode(t *testing.T) {
t.Parallel()

var (
hash = make([]byte, 20)
elems = make([]byte, 20)
)
for i := 0; i < 5000000; i++ {
crand.Read(hash)
crand.Read(elems)
prng.Read(hash)
prng.Read(elems)
decodeNode(hash, elems)
}
}

0 comments on commit 5a0db3f

Please sign in to comment.