diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-16 18:27:38 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-16 18:27:38 +0800 |
| commit | b5234413611ce5984292f85a01de1f56c045b490 (patch) | |
| tree | e6e0c6f7fe8358a2dc63cdea11ac66b4f59397f5 /miner | |
| parent | 0b8f66ed9ef177dc72442dd7ba337c6733e30344 (diff) | |
| download | dexon-b5234413611ce5984292f85a01de1f56c045b490.tar dexon-b5234413611ce5984292f85a01de1f56c045b490.tar.gz dexon-b5234413611ce5984292f85a01de1f56c045b490.tar.bz2 dexon-b5234413611ce5984292f85a01de1f56c045b490.tar.lz dexon-b5234413611ce5984292f85a01de1f56c045b490.tar.xz dexon-b5234413611ce5984292f85a01de1f56c045b490.tar.zst dexon-b5234413611ce5984292f85a01de1f56c045b490.zip | |
Moved ethutil => common
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/worker.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/miner/worker.go b/miner/worker.go index 5c4a13698..10fc6f508 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" @@ -155,10 +155,10 @@ func (self *worker) wait() { self.current.block.Header().MixDigest = work.MixDigest jsonlogger.LogJson(&logger.EthMinerNewBlock{ - BlockHash: ethutil.Bytes2Hex(block.Hash()), + BlockHash: common.Bytes2Hex(block.Hash()), BlockNumber: block.Number(), - ChainHeadHash: ethutil.Bytes2Hex(block.ParentHeaderHash), - BlockPrevHash: ethutil.Bytes2Hex(block.ParentHeaderHash), + ChainHeadHash: common.Bytes2Hex(block.ParentHeaderHash), + BlockPrevHash: common.Bytes2Hex(block.ParentHeaderHash), }) if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil { @@ -221,7 +221,7 @@ gasLimit: self.current.state.AddBalance(self.coinbase, core.BlockReward) - self.current.state.Update(ethutil.Big0) + self.current.state.Update(common.Big0) self.push() } |