Unverified Commit 2c58e6b6 authored by Darioush Jalali's avatar Darioush Jalali Committed by GitHub

trie: use keyvalue reader for non-mutating methods (#24221)

parent 52448e95
...@@ -115,7 +115,7 @@ type NodeIterator interface { ...@@ -115,7 +115,7 @@ type NodeIterator interface {
// Before adding a similar mechanism to any other place in Geth, consider // Before adding a similar mechanism to any other place in Geth, consider
// making trie.Database an interface and wrapping at that level. It's a huge // making trie.Database an interface and wrapping at that level. It's a huge
// refactor, but it could be worth it if another occurrence arises. // refactor, but it could be worth it if another occurrence arises.
AddResolver(ethdb.KeyValueStore) AddResolver(ethdb.KeyValueReader)
} }
// nodeIteratorState represents the iteration state at one particular node of the // nodeIteratorState represents the iteration state at one particular node of the
...@@ -134,7 +134,7 @@ type nodeIterator struct { ...@@ -134,7 +134,7 @@ type nodeIterator struct {
path []byte // Path to the current node path []byte // Path to the current node
err error // Failure set in case of an internal error in the iterator err error // Failure set in case of an internal error in the iterator
resolver ethdb.KeyValueStore // Optional intermediate resolver above the disk layer resolver ethdb.KeyValueReader // Optional intermediate resolver above the disk layer
} }
// errIteratorEnd is stored in nodeIterator.err when iteration is done. // errIteratorEnd is stored in nodeIterator.err when iteration is done.
...@@ -159,7 +159,7 @@ func newNodeIterator(trie *Trie, start []byte) NodeIterator { ...@@ -159,7 +159,7 @@ func newNodeIterator(trie *Trie, start []byte) NodeIterator {
return it return it
} }
func (it *nodeIterator) AddResolver(resolver ethdb.KeyValueStore) { func (it *nodeIterator) AddResolver(resolver ethdb.KeyValueReader) {
it.resolver = resolver it.resolver = resolver
} }
...@@ -549,7 +549,7 @@ func (it *differenceIterator) Path() []byte { ...@@ -549,7 +549,7 @@ func (it *differenceIterator) Path() []byte {
return it.b.Path() return it.b.Path()
} }
func (it *differenceIterator) AddResolver(resolver ethdb.KeyValueStore) { func (it *differenceIterator) AddResolver(resolver ethdb.KeyValueReader) {
panic("not implemented") panic("not implemented")
} }
...@@ -660,7 +660,7 @@ func (it *unionIterator) Path() []byte { ...@@ -660,7 +660,7 @@ func (it *unionIterator) Path() []byte {
return (*it.items)[0].Path() return (*it.items)[0].Path()
} }
func (it *unionIterator) AddResolver(resolver ethdb.KeyValueStore) { func (it *unionIterator) AddResolver(resolver ethdb.KeyValueReader) {
panic("not implemented") panic("not implemented")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment