forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 15:16:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

trie: add Err to Iterator

Browse source 
This is useful for testing because the underlying NodeIterator doesn't
need to be kept in a separate variable just to get the error.
This commit is contained in:
Felix Lange 2017-06-07 17:04:14 +02:00
parent d36e4a4176
commit d6516d58b2
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
trie/iterator.go
View file

@ -32,6 +32,7 @@ type Iterator struct {
Key []byte // Current data key on which the iterator is positioned on Key []byte // Current data key on which the iterator is positioned on
Value []byte // Current data value on which the iterator is positioned on Value []byte // Current data value on which the iterator is positioned on
Err error
} }
// NewIterator creates a new key-value iterator from a node iterator // NewIterator creates a new key-value iterator from a node iterator
@ -52,6 +53,7 @@ func (it *Iterator) Next() bool {
} }
it.Key = nil it.Key = nil
it.Value = nil it.Value = nil
it.Err = it.nodeIt.Error()
return false return false
} }
@ -165,8 +167,8 @@ func (it *nodeIterator) Next(descend bool) bool {
} }
// Otherwise step forward with the iterator and report any errors // Otherwise step forward with the iterator and report any errors
state, parentIndex, path, err := it.peek(descend) state, parentIndex, path, err := it.peek(descend)
it.err = err
if err != nil { if err != nil {
it.err = err
return false return false
} }
it.push(state, parentIndex, path) it.push(state, parentIndex, path)
@ -180,8 +182,8 @@ func (it *nodeIterator) seek(prefix []byte) {
// Move forward until we're just before the closest match to key. // Move forward until we're just before the closest match to key.
for { for {
state, parentIndex, path, err := it.peek(bytes.HasPrefix(key, it.path)) state, parentIndex, path, err := it.peek(bytes.HasPrefix(key, it.path))
it.err = err
if err != nil || bytes.Compare(path, key) >= 0 { if err != nil || bytes.Compare(path, key) >= 0 {
it.err = err
return return
} }
it.push(state, parentIndex, path) it.push(state, parentIndex, path)