diff options
| author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
|---|---|---|
| committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-17 19:29:10 +0800 |
| commit | abb9b7f46ff3b2ef0bb4f2e95f029591688768c4 (patch) | |
| tree | c4088c788b3e86935a2b8fd2fbe157340476f091 /miner | |
| parent | fbd5e4d5afeaff6c250a3a953b18476cdb4b86ae (diff) | |
| parent | c934222a8089b19587242a3b0bc71ea0aec1d5ef (diff) | |
| download | dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.gz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.bz2 dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.lz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.xz dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.tar.zst dexon-abb9b7f46ff3b2ef0bb4f2e95f029591688768c4.zip | |
Merge branch 'develop' into ui
Diffstat (limited to 'miner')
| -rw-r--r-- | miner/miner.go | 8 | ||||
| -rw-r--r-- | miner/worker.go | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/miner/miner.go b/miner/miner.go index e3e7bead2..27afcf684 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -3,7 +3,7 @@ package miner import ( "math/big" - "github.com/ethereum/go-ethereum/eth" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow/ezp" ) @@ -16,13 +16,13 @@ type Miner struct { MinAcceptedGasPrice *big.Int Extra string - coinbase []byte + Coinbase []byte mining bool } -func New(coinbase []byte, eth *eth.Ethereum) *Miner { +func New(coinbase []byte, eth core.Backend) *Miner { miner := &Miner{ - coinbase: coinbase, + Coinbase: coinbase, worker: newWorker(coinbase, eth), } diff --git a/miner/worker.go b/miner/worker.go index 2b64f3210..47b462e53 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -8,7 +8,6 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/pow" @@ -25,7 +24,7 @@ type environment struct { uncles *set.Set } -func env(block *types.Block, eth *eth.Ethereum) *environment { +func env(block *types.Block, eth core.Backend) *environment { state := state.New(block.Root(), eth.Db()) env := &environment{ totalUsedGas: new(big.Int), @@ -63,7 +62,7 @@ type worker struct { quit chan struct{} pow pow.PoW - eth *eth.Ethereum + eth core.Backend chain *core.ChainManager proc *core.BlockProcessor coinbase []byte @@ -73,7 +72,7 @@ type worker struct { mining bool } -func newWorker(coinbase []byte, eth *eth.Ethereum) *worker { +func newWorker(coinbase []byte, eth core.Backend) *worker { return &worker{ eth: eth, mux: eth.EventMux(), |