diff options
author | Felix Lange <fjl@users.noreply.github.com> | 2017-06-21 00:26:09 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-21 00:26:09 +0800 |
commit | 693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac (patch) | |
tree | 566c3753dc6594723f6d7d51d5dc2c6fef20ad53 /trie/proof.go | |
parent | 431cf2a1e453346bcc627ac1fb9df3950a6c3499 (diff) | |
download | dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.gz dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.bz2 dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.lz dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.xz dexon-693d9ccbfbbcf7c32d3ff9fd8a432941e129a4ac.tar.zst dexon-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/proof.go')
-rw-r--r-- | trie/proof.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/trie/proof.go b/trie/proof.go index fb7734b86..1f8f76b1b 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -58,7 +58,7 @@ func (t *Trie) Prove(key []byte) []rlp.RawValue { nodes = append(nodes, n) case hashNode: var err error - tn, err = t.resolveHash(n, nil, nil) + tn, err = t.resolveHash(n, nil) if err != nil { log.Error(fmt.Sprintf("Unhandled trie error: %v", err)) return nil |