diff options
author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
---|---|---|
committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /trie/iterator.go | |
parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
download | go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst go-tangerine-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'trie/iterator.go')
-rw-r--r-- | trie/iterator.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/trie/iterator.go b/trie/iterator.go index f0dae28bb..3b3ddd751 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -23,7 +23,6 @@ func (self *Iterator) Next() bool { self.Key = []byte(DecodeCompact(k)) return len(k) > 0 - } func (self *Iterator) next(node Node, key []byte) []byte { @@ -67,7 +66,7 @@ func (self *Iterator) next(node Node, key []byte) []byte { if BeginsWith(key, k) { ret = self.next(cnode, skey) } else if bytes.Compare(k, key[:len(k)]) > 0 { - ret = self.key(node) + return self.key(node) } if ret != nil { |