all: clean up and proerly abstract database access
This commit is contained in:
@@ -25,7 +25,7 @@ import (
|
||||
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
"github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/ethereum/go-ethereum/ethdb"
|
||||
"github.com/ethereum/go-ethereum/ethdb/memorydb"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -34,18 +34,18 @@ func init() {
|
||||
|
||||
// makeProvers creates Merkle trie provers based on different implementations to
|
||||
// test all variations.
|
||||
func makeProvers(trie *Trie) []func(key []byte) *ethdb.MemDatabase {
|
||||
var provers []func(key []byte) *ethdb.MemDatabase
|
||||
func makeProvers(trie *Trie) []func(key []byte) *memorydb.MemoryDatabase {
|
||||
var provers []func(key []byte) *memorydb.MemoryDatabase
|
||||
|
||||
// Create a direct trie based Merkle prover
|
||||
provers = append(provers, func(key []byte) *ethdb.MemDatabase {
|
||||
proof := ethdb.NewMemDatabase()
|
||||
provers = append(provers, func(key []byte) *memorydb.MemoryDatabase {
|
||||
proof := memorydb.New()
|
||||
trie.Prove(key, 0, proof)
|
||||
return proof
|
||||
})
|
||||
// Create a leaf iterator based Merkle prover
|
||||
provers = append(provers, func(key []byte) *ethdb.MemDatabase {
|
||||
proof := ethdb.NewMemDatabase()
|
||||
provers = append(provers, func(key []byte) *memorydb.MemoryDatabase {
|
||||
proof := memorydb.New()
|
||||
if it := NewIterator(trie.NodeIterator(key)); it.Next() && bytes.Equal(key, it.Key) {
|
||||
for _, p := range it.Prove() {
|
||||
proof.Put(crypto.Keccak256(p), p)
|
||||
@@ -106,9 +106,14 @@ func TestBadProof(t *testing.T) {
|
||||
if proof == nil {
|
||||
t.Fatalf("prover %d: nil proof", i)
|
||||
}
|
||||
key := proof.Keys()[mrand.Intn(proof.Len())]
|
||||
it := proof.NewIterator()
|
||||
for i, d := 0, mrand.Intn(proof.Len()); i <= d; i++ {
|
||||
it.Next()
|
||||
}
|
||||
key := it.Key()
|
||||
val, _ := proof.Get(key)
|
||||
proof.Delete(key)
|
||||
it.Release()
|
||||
|
||||
mutateByte(val)
|
||||
proof.Put(crypto.Keccak256(val), val)
|
||||
@@ -127,7 +132,7 @@ func TestMissingKeyProof(t *testing.T) {
|
||||
updateString(trie, "k", "v")
|
||||
|
||||
for i, key := range []string{"a", "j", "l", "z"} {
|
||||
proof := ethdb.NewMemDatabase()
|
||||
proof := memorydb.New()
|
||||
trie.Prove([]byte(key), 0, proof)
|
||||
|
||||
if proof.Len() != 1 {
|
||||
@@ -164,8 +169,8 @@ func BenchmarkProve(b *testing.B) {
|
||||
b.ResetTimer()
|
||||
for i := 0; i < b.N; i++ {
|
||||
kv := vals[keys[i%len(keys)]]
|
||||
proofs := ethdb.NewMemDatabase()
|
||||
if trie.Prove(kv.k, 0, proofs); len(proofs.Keys()) == 0 {
|
||||
proofs := memorydb.New()
|
||||
if trie.Prove(kv.k, 0, proofs); proofs.Len() == 0 {
|
||||
b.Fatalf("zero length proof for %x", kv.k)
|
||||
}
|
||||
}
|
||||
@@ -175,10 +180,10 @@ func BenchmarkVerifyProof(b *testing.B) {
|
||||
trie, vals := randomTrie(100)
|
||||
root := trie.Hash()
|
||||
var keys []string
|
||||
var proofs []*ethdb.MemDatabase
|
||||
var proofs []*memorydb.MemoryDatabase
|
||||
for k := range vals {
|
||||
keys = append(keys, k)
|
||||
proof := ethdb.NewMemDatabase()
|
||||
proof := memorydb.New()
|
||||
trie.Prove([]byte(k), 0, proof)
|
||||
proofs = append(proofs, proof)
|
||||
}
|
||||
|
Reference in New Issue
Block a user