cerc-io/eth-statediff-service
16
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Roy Crihfield 2020-09-06 12:52:48 -05:00
parent c93735851a
commit 8ff057a1ea
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/builder.go
View File

@ -51,6 +51,10 @@ type builder struct {
stateCache state.Database
}
type iterPair struct {
older, newer trie.NodeIterator
}
// NewBuilder is used to create a statediff builder
func NewBuilder(stateCache state.Database) Builder {
return &builder{
@ -58,15 +62,6 @@ func NewBuilder(stateCache state.Database) Builder {
}
}
// Wraps factory functions for trie or subtrie iterators
type iterPair struct {
older, newer trie.NodeIterator
}
// type WorkerArgs struct {
// GetOldIterator, GetNewIterator func () trie.NodeIterator
// }
// BuildStateTrieObject builds a state trie object from the provided block
func (sdb *builder) BuildStateTrieObject(current *types.Block) (StateObject, error) {
currentTrie, err := sdb.stateCache.OpenTrie(current.Root())
@ -159,8 +154,7 @@ func (sdb *builder) buildStateTrie(it trie.NodeIterator) ([]StateNode, error) {
func (sdb *builder) BuildStateDiffObject(args Args, params Params) (StateObject, error) {
if len(params.WatchedAddresses) > 0 {
// if we are watching only specific accounts then we are only diffing leaf nodes
// todo - error in cmd?
log.Warn("Ignoring intermediate state nodes because WatchedAddresses was passed")
log.Info("Ignoring intermediate state nodes because WatchedAddresses was passed")
params.IntermediateStateNodes = false
}
@ -183,6 +177,7 @@ func (sdb *builder) BuildStateDiffObject(args Args, params Params) (StateObject,
newIterFac := iter.NewSubtrieIteratorFactory(newTrie, nWorkers)
iterChan := make(chan []iterPair, nWorkers)
// Create iterators ahead of time to avoid race condition in state.Trie access
for i := uint(0); i < nWorkers; i++ {
// two state iterations per diff build
iterChan <- []iterPair{