diff options
author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-11 23:10:37 +0800 |
---|---|---|
committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-09-11 23:10:37 +0800 |
commit | 0eac601b5b67ce15201901710fd6be089ccb8b6e (patch) | |
tree | 2dfb3b7365895203132bd6d1aa650b5a239b01eb /miner/worker.go | |
parent | 4e075e401354b4ee068cf78b1f283763fe927245 (diff) | |
parent | cdc2662c4098d68a7b450b9b9ff2688acbffcee4 (diff) | |
download | go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar.gz go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar.bz2 go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar.lz go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar.xz go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.tar.zst go-tangerine-0eac601b5b67ce15201901710fd6be089ccb8b6e.zip |
Merge pull request #1779 from karalabe/split-block-storage-3000
core: split the db blocks into components, move TD out top level
Diffstat (limited to 'miner/worker.go')
-rw-r--r-- | miner/worker.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/miner/worker.go b/miner/worker.go index 16a16931d..2f43b110f 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -283,7 +283,7 @@ func (self *worker) wait() { continue } - stat, err := self.chain.WriteBlock(block, false) + stat, err := self.chain.WriteBlock(block) if err != nil { glog.V(logger.Error).Infoln("error writing block to chain", err) continue @@ -533,14 +533,12 @@ func (self *worker) commitNewWork() { // create the new block whose nonce will be mined. work.Block = types.NewBlock(header, work.txs, uncles, work.receipts) - work.Block.Td = new(big.Int).Set(core.CalcTD(work.Block, self.chain.GetBlock(work.Block.ParentHash()))) // We only care about logging if we're actually mining. if atomic.LoadInt32(&self.mining) == 1 { glog.V(logger.Info).Infof("commit new work on block %v with %d txs & %d uncles. Took %v\n", work.Block.Number(), work.tcount, len(uncles), time.Since(tstart)) self.logLocalMinedBlocks(work, previous) } - self.push(work) } |