diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2017-01-06 21:42:03 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-06 21:42:03 +0800 |
| commit | 8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184 (patch) | |
| tree | 92a336065bddcd620798e8f552432e3ed62ee14a /core/blockchain.go | |
| parent | e0ee0cc66a4416edd47232649f4d4bca4a5e3c07 (diff) | |
| parent | d3b751e4d94f95f6cc89544852f2d5811e075665 (diff) | |
| download | dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.gz dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.bz2 dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.lz dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.xz dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.tar.zst dexon-8f9daaa3ba71c3b6bdcc24adfdc987e6f3a2e184.zip | |
Merge pull request #3518 from fjl/ethclient-dependency-cleanup
core/types: dependency cleanup
Diffstat (limited to 'core/blockchain.go')
| -rw-r--r-- | core/blockchain.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/blockchain.go b/core/blockchain.go index 0de529480..2081457a9 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -883,7 +883,7 @@ func (self *BlockChain) InsertChain(chain types.Blocks) (int, error) { var ( stats = insertStats{startTime: time.Now()} events = make([]interface{}, 0, len(chain)) - coalescedLogs vm.Logs + coalescedLogs []*types.Log nonceChecked = make([]bool, len(chain)) ) @@ -1094,7 +1094,7 @@ func (self *BlockChain) reorg(oldBlock, newBlock *types.Block) error { oldStart = oldBlock newStart = newBlock deletedTxs types.Transactions - deletedLogs vm.Logs + deletedLogs []*types.Log // collectLogs collects the logs that were generated during the // processing of the block that corresponds with the given hash. // These logs are later announced as deleted. @@ -1210,7 +1210,7 @@ func (self *BlockChain) reorg(oldBlock, newBlock *types.Block) error { // postChainEvents iterates over the events generated by a chain insertion and // posts them into the event mux. -func (self *BlockChain) postChainEvents(events []interface{}, logs vm.Logs) { +func (self *BlockChain) postChainEvents(events []interface{}, logs []*types.Log) { // post event logs for further processing self.eventMux.Post(logs) for _, event := range events { |