cerc-io/go-ethereum
13
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Clean up log lines and remove unnecessary fields from builder

Browse Source
This commit is contained in:
Elizabeth Engelman 2019-02-12 15:00:19 -06:00
parent 08d0fe314b
commit e3805807de
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/blockchain.go
View File

@ -1018,16 +1018,16 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
count, ok := bc.stateDiffsProcessed[root.(common.Hash)] count, ok := bc.stateDiffsProcessed[root.(common.Hash)]
//if we haven't processed the statediff for a given state root and it's child, don't dereference it yet //if we haven't processed the statediff for a given state root and it's child, don't dereference it yet
if !ok { if !ok {
log.Info("Current root NOT found root in stateDiffsProcessed", "root", root.(common.Hash).Hex()) log.Debug("Current root NOT found root in stateDiffsProcessed", "root", root.(common.Hash).Hex())
bc.triegc.Push(root, number) bc.triegc.Push(root, number)
break break
} }
if count < 2 { if count < 2 {
log.Info("Current root has not yet been processed for it's child", "root", root.(common.Hash).Hex()) log.Debug("Current root has not yet been processed for it's child", "root", root.(common.Hash).Hex())
bc.triegc.Push(root, number) bc.triegc.Push(root, number)
break break
} else { } else {
log.Warn("Current root found in stateDiffsProcessed collection with a count of 2, okay to dereference", log.Debug("Current root found in stateDiffsProcessed collection with a count of 2, okay to dereference",
"root", root.(common.Hash).Hex(), "root", root.(common.Hash).Hex(),
"blockNumber", uint64(-number), "blockNumber", uint64(-number),
"size of stateDiffsProcessed", len(bc.stateDiffsProcessed)) "size of stateDiffsProcessed", len(bc.stateDiffsProcessed))
@ -1036,7 +1036,7 @@ func (bc *BlockChain) WriteBlockWithState(block *types.Block, receipts []*types.
} }
} }
log.Info("DEREFERENCING", "root", root.(common.Hash).Hex()) log.Debug("Dereferencing", "root", root.(common.Hash).Hex())
triedb.Dereference(root.(common.Hash)) triedb.Dereference(root.(common.Hash))
} }
} }

4
statediff/builder/builder.go
View File

@ -36,8 +36,6 @@ type Builder interface {
type builder struct { type builder struct {
chainDB ethdb.Database chainDB ethdb.Database
trieDB *trie.Database
cachedTrie *trie.Trie
blockChain *core.BlockChain blockChain *core.BlockChain
} }
@ -46,7 +44,6 @@ type AccountsMap map[common.Hash]*state.Account
func NewBuilder(db ethdb.Database, blockChain *core.BlockChain) *builder { func NewBuilder(db ethdb.Database, blockChain *core.BlockChain) *builder {
return &builder{ return &builder{
chainDB: db, chainDB: db,
trieDB: trie.NewDatabase(db),
blockChain: blockChain, blockChain: blockChain,
} }
} }
@ -121,7 +118,6 @@ func (sdb *builder) collectDiffNodes(a, b trie.NodeIterator) (AccountsMap, error
for { for {
log.Debug("Current Path and Hash", "path", pathToStr(it), "hashold", it.Hash()) log.Debug("Current Path and Hash", "path", pathToStr(it), "hashold", it.Hash())
if it.Leaf() { if it.Leaf() {
leafKey := make([]byte, len(it.LeafKey())) leafKey := make([]byte, len(it.LeafKey()))
copy(leafKey, it.LeafKey()) copy(leafKey, it.LeafKey())
leafKeyHash := common.BytesToHash(leafKey) leafKeyHash := common.BytesToHash(leafKey)