cerc-io/eth-iterator-utils
13
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

go fmt, cleanup

Browse Source
This commit is contained in:
Roy Crihfield 2020-09-06 12:55:48 -05:00
parent 3715d87161
commit fb1768b7a9
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/iterator/iterator.go
View File

@ -37,7 +37,6 @@ func (it *PrefixBoundIterator) Next(descend bool) bool {
if !it.current.Next(descend) { if !it.current.Next(descend) {
return false return false
} }
p := it.current.Path(); if len(p) >= 4 { p = p[:4] }
// stop if underlying iterator went past endKey // stop if underlying iterator went past endKey
cmp := bytes.Compare(it.current.Path(), it.endKey) cmp := bytes.Compare(it.current.Path(), it.endKey)
return cmp <= 0 return cmp <= 0
@ -61,7 +60,7 @@ func (it *PrefixBoundIterator) LeafKey() []byte {
func (it *PrefixBoundIterator) LeafBlob() []byte { func (it *PrefixBoundIterator) LeafBlob() []byte {
return it.current.LeafBlob() return it.current.LeafBlob()
} }
func (it *PrefixBoundIterator) LeafProof() [][]byte { func (it *PrefixBoundIterator) LeafProof() [][]byte {
return it.current.LeafProof() return it.current.LeafProof()
} }
func (it *PrefixBoundIterator) Parent() common.Hash { func (it *PrefixBoundIterator) Parent() common.Hash {
@ -74,8 +73,8 @@ func NewPrefixBoundIterator(it trie.NodeIterator, to []byte) *PrefixBoundIterato
} }
type prefixGenerator struct { type prefixGenerator struct {
current []byte current []byte
step byte step byte
stepIndex uint stepIndex uint
} }
@ -94,9 +93,9 @@ func newPrefixGenerator(nbins uint) prefixGenerator {
nbins = nbins >> 4 nbins = nbins >> 4
} }
return prefixGenerator{ return prefixGenerator{
current: make([]byte, stepIndex), current: make([]byte, stepIndex),
step: step, step: step,
stepIndex: stepIndex-1, stepIndex: stepIndex - 1,
} }
} }
@ -112,7 +111,7 @@ func (gen *prefixGenerator) Next() {
gen.current[gen.stepIndex] += gen.step gen.current[gen.stepIndex] += gen.step
overflow := false overflow := false
for ix := 0; ix < len(gen.current); ix++ { for ix := 0; ix < len(gen.current); ix++ {
rix := len(gen.current)-1-ix // reverse rix := len(gen.current) - 1 - ix // reverse
if overflow { if overflow {
gen.current[rix]++ gen.current[rix]++
overflow = false overflow = false
@ -124,7 +123,7 @@ func (gen *prefixGenerator) Next() {
} }
} }
// Generates paths that cut the trie domain into "nbins" uniform bins, w/ optional prefix // Generates paths that cut trie domain into "nbins" uniform conterminous bins (w/ opt. prefix)
// eg. MakePaths([], 2) => [[0] [8]] // eg. MakePaths([], 2) => [[0] [8]]
// MakePaths([4], 32) => [[4 0 0] [4 0 8] [4 1 0]... [4 f 8]] // MakePaths([4], 32) => [[4 0 0] [4 0 8] [4 1 0]... [4 f 8]]
func MakePaths(prefix []byte, nbins uint) [][]byte { func MakePaths(prefix []byte, nbins uint) [][]byte {
@ -138,13 +137,13 @@ func MakePaths(prefix []byte, nbins uint) [][]byte {
return res return res
} }
func eachPrefixRange(prefix []byte, nbins uint, callback func ([]byte, []byte)) { func eachPrefixRange(prefix []byte, nbins uint, callback func([]byte, []byte)) {
prefixes := MakePaths(prefix, nbins) prefixes := MakePaths(prefix, nbins)
prefixes = append(prefixes, nil) // include tail prefixes = append(prefixes, nil) // include tail
prefixes[0] = nil // set bin 0 left bound to nil to include root prefixes[0] = nil // set bin 0 left bound to nil to include root
for i := 0; i < len(prefixes)-1; i++ { for i := 0; i < len(prefixes)-1; i++ {
key := prefixes[i] key := prefixes[i]
if len(key)%2 != 0 { // zero-pad for odd-length keys if len(key)%2 != 0 { // zero-pad for odd-length keys
key = append(key, 0) key = append(key, 0)
} }
callback(key, prefixes[i+1]) callback(key, prefixes[i+1])
@ -154,7 +153,7 @@ func eachPrefixRange(prefix []byte, nbins uint, callback func ([]byte, []byte))
// Cut a trie by path prefix, returning `nbins` iterators covering its subtries // Cut a trie by path prefix, returning `nbins` iterators covering its subtries
func SubtrieIterators(tree state.Trie, nbins uint) []trie.NodeIterator { func SubtrieIterators(tree state.Trie, nbins uint) []trie.NodeIterator {
var iters []trie.NodeIterator var iters []trie.NodeIterator
eachPrefixRange(nil, nbins, func (key []byte, endKey []byte) { eachPrefixRange(nil, nbins, func(key []byte, endKey []byte) {
it := tree.NodeIterator(HexToKeyBytes(key)) it := tree.NodeIterator(HexToKeyBytes(key))
iters = append(iters, NewPrefixBoundIterator(it, endKey)) iters = append(iters, NewPrefixBoundIterator(it, endKey))
}) })
@ -163,7 +162,7 @@ func SubtrieIterators(tree state.Trie, nbins uint) []trie.NodeIterator {
// Factory for per-bin subtrie iterators // Factory for per-bin subtrie iterators
type SubtrieIteratorFactory struct { type SubtrieIteratorFactory struct {
tree state.Trie tree state.Trie
startKeys, endKeys [][]byte startKeys, endKeys [][]byte
} }
@ -178,7 +177,7 @@ func (fac *SubtrieIteratorFactory) IteratorAt(bin uint) *PrefixBoundIterator {
func NewSubtrieIteratorFactory(tree state.Trie, nbins uint) SubtrieIteratorFactory { func NewSubtrieIteratorFactory(tree state.Trie, nbins uint) SubtrieIteratorFactory {
starts := make([][]byte, 0, nbins) starts := make([][]byte, 0, nbins)
ends := make([][]byte, 0, nbins) ends := make([][]byte, 0, nbins)
eachPrefixRange(nil, nbins, func (key []byte, endKey []byte) { eachPrefixRange(nil, nbins, func(key []byte, endKey []byte) {
starts = append(starts, key) starts = append(starts, key)
ends = append(ends, endKey) ends = append(ends, endKey)
}) })