aboutsummaryrefslogtreecommitdiffstats
path: root/trie/errors.go
diff options
context:
space:
mode:
authorFelix Lange <fjl@users.noreply.github.com>2017-06-21 00:26:09 +0800
committerGitHub <noreply@github.com>2017-06-21 00:26:09 +0800
commit693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac (patch)
tree566c3753dc6594723f6d7d51d5dc2c6fef20ad53 /trie/errors.go
parent431cf2a1e453346bcc627ac1fb9df3950a6c3499 (diff)
downloadgo-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.gz
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.bz2
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.lz
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.xz
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.zst
go-tangerine-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.zip
trie: more node iterator improvements (#14615)
* ethdb: remove Set Set deadlocks immediately and isn't part of the Database interface. * trie: add Err to Iterator This is useful for testing because the underlying NodeIterator doesn't need to be kept in a separate variable just to get the error. * trie: add LeafKey to iterator, panic when not at leaf LeafKey is useful for callers that can't interpret Path. * trie: retry failed seek/peek in iterator Next Instead of failing iteration irrecoverably, make it so Next retries the pending seek or peek every time. Smaller changes in this commit make this easier to test: * The iterator previously returned from Next on encountering a hash node. This caused it to visit the same path twice. * Path returned nibbles with terminator symbol for valueNode attached to fullNode, but removed it for valueNode attached to shortNode. Now the terminator is always present. This makes Path unique to each node and simplifies Leaf. * trie: add Path to MissingNodeError The light client trie iterator needs to know the path of the node that's missing so it can retrieve a proof for it. NodeIterator.Path is not sufficient because it is updated when the node is resolved and actually visited by the iterator. Also remove unused fields. They were added a long time ago before we knew which fields would be needed for the light client.
Diffstat (limited to 'trie/errors.go')
-rw-r--r--trie/errors.go21
1 files changed, 5 insertions, 16 deletions
diff --git a/trie/errors.go b/trie/errors.go
index e23f9d563..567b80078 100644
--- a/trie/errors.go
+++ b/trie/errors.go
@@ -23,24 +23,13 @@ import (
)
// MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete)
-// in the case where a trie node is not present in the local database. Contains
-// information necessary for retrieving the missing node through an ODR service.
-//
-// NodeHash is the hash of the missing node
-//
-// RootHash is the original root of the trie that contains the node
-//
-// PrefixLen is the nibble length of the key prefix that leads from the root to
-// the missing node
-//
-// SuffixLen is the nibble length of the remaining part of the key that hints on
-// which further nodes should also be retrieved (can be zero when there are no
-// such hints in the error message)
+// in the case where a trie node is not present in the local database. It contains
+// information necessary for retrieving the missing node.
type MissingNodeError struct {
- RootHash, NodeHash common.Hash
- PrefixLen, SuffixLen int
+ NodeHash common.Hash // hash of the missing node
+ Path []byte // hex-encoded path to the missing node
}
func (err *MissingNodeError) Error() string {
- return fmt.Sprintf("Missing trie node %064x", err.NodeHash)
+ return fmt.Sprintf("missing trie node %x (path %x)", err.NodeHash, err.Path)
}