cerc-io/ipld-eth-state-snapshot
16
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

update iterator

Browse Source
This commit is contained in:
Roy Crihfield 2020-09-06 02:36:36 -05:00
parent 169887f39f
commit 66d6acc1fe
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/snapshot/service.go
View File

@ -112,7 +112,7 @@ type nodeResult struct {
elements []interface{} elements []interface{}
} }
func resolveNode(it iter.NodeIterator, trieDB *trie.Database) (*nodeResult, error) { func resolveNode(it trie.NodeIterator, trieDB *trie.Database) (*nodeResult, error) {
nodePath := make([]byte, len(it.Path())) nodePath := make([]byte, len(it.Path()))
copy(nodePath, it.Path()) copy(nodePath, it.Path())
node, err := trieDB.Node(it.Hash()) node, err := trieDB.Node(it.Hash())
@ -137,7 +137,7 @@ func resolveNode(it iter.NodeIterator, trieDB *trie.Database) (*nodeResult, erro
}, nil }, nil
} }
func (s *Service) processNode(it iter.NodeIterator, headerID int64) error { func (s *Service) processNode(it trie.NodeIterator, headerID int64) error {
if it.Leaf() { // "leaf" nodes are actually "value" nodes, whose parents are the actual leaves if it.Leaf() { // "leaf" nodes are actually "value" nodes, whose parents are the actual leaves
return nil return nil
} }
@ -189,7 +189,7 @@ func (s *Service) processNode(it iter.NodeIterator, headerID int64) error {
return nil return nil
} }
func (s *Service) createSnapshot(it iter.NodeIterator, headerID int64) error { func (s *Service) createSnapshot(it trie.NodeIterator, headerID int64) error {
for it.Next(true) { for it.Next(true) {
if err := s.processNode(it, headerID); err != nil { if err := s.processNode(it, headerID); err != nil {
return err return err
@ -204,7 +204,9 @@ func (s *Service) createSnapshotAsync(tree state.Trie, headerID int64, workers u
finished := make(chan bool) finished := make(chan bool)
var wg sync.WaitGroup var wg sync.WaitGroup
iter.VisitSubtries(tree, workers, func (it iter.NodeIterator) { iters := iter.SubtrieIterators(tree, workers)
for _, it := range iters {
wg.Add(1) wg.Add(1)
go func() { go func() {
defer wg.Done() defer wg.Done()
@ -212,7 +214,7 @@ func (s *Service) createSnapshotAsync(tree state.Trie, headerID int64, workers u
errors <- err errors <- err
} }
}() }()
}) }
go func() { go func() {
defer close(finished) defer close(finished)