diff options
author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-08-19 03:16:33 +0800 |
---|---|---|
committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-08-19 03:46:26 +0800 |
commit | b4369e10150f4c1211ae1bf2de6cf0567e9a7dd2 (patch) | |
tree | 9fdbbe9ff489253506059f2b4f48ac451d3d401e /core | |
parent | 2497f28aa9d74f84468055fbc4675f379b7e4a5a (diff) | |
download | dexon-b4369e10150f4c1211ae1bf2de6cf0567e9a7dd2.tar.gz dexon-b4369e10150f4c1211ae1bf2de6cf0567e9a7dd2.tar.zst dexon-b4369e10150f4c1211ae1bf2de6cf0567e9a7dd2.zip |
core, miner: write miner receipts
Diffstat (limited to 'core')
-rw-r--r-- | core/block_processor.go | 8 | ||||
-rw-r--r-- | core/chain_manager.go | 4 | ||||
-rw-r--r-- | core/filter.go | 4 |
3 files changed, 9 insertions, 7 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index 829e4314c..dd7fe8962 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -349,11 +349,9 @@ func (sm *BlockProcessor) GetBlockReceipts(bhash common.Hash) types.Receipts { // the depricated way by re-processing the block. func (sm *BlockProcessor) GetLogs(block *types.Block) (logs state.Logs, err error) { receipts := GetBlockReceipts(sm.chainDb, block.Hash()) - if len(receipts) > 0 { - // coalesce logs - for _, receipt := range receipts { - logs = append(logs, receipt.Logs()...) - } + // coalesce logs + for _, receipt := range receipts { + logs = append(logs, receipt.Logs()...) } return logs, nil } diff --git a/core/chain_manager.go b/core/chain_manager.go index 1647031b1..cf5b8bd78 100644 --- a/core/chain_manager.go +++ b/core/chain_manager.go @@ -647,7 +647,9 @@ func (self *ChainManager) InsertChain(chain types.Blocks) (int, error) { queue[i] = ChainSplitEvent{block, logs} queueEvent.splitCount++ } - PutBlockReceipts(self.chainDb, block, receipts) + if err := PutBlockReceipts(self.chainDb, block, receipts); err != nil { + glog.V(logger.Warn).Infoln("error writing block receipts:", err) + } stats.processed++ } diff --git a/core/filter.go b/core/filter.go index 8a876396b..c34d6ff6c 100644 --- a/core/filter.go +++ b/core/filter.go @@ -22,6 +22,8 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" ) type AccountChange struct { @@ -111,7 +113,7 @@ done: // Get the logs of the block unfiltered, err := self.eth.BlockProcessor().GetLogs(block) if err != nil { - chainlogger.Warnln("err: filter get logs ", err) + glog.V(logger.Warn).Infoln("err: filter get logs ", err) break } |