diff options
| author | Felix Lange <fjl@twurst.com> | 2016-08-18 02:59:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-18 02:59:59 +0800 |
| commit | 475521dd747070372f84c2b0ac202e14216dc0e0 (patch) | |
| tree | e97fb7892b21c503a7661578df0ff5a1f6d8e29c /miner/worker.go | |
| parent | 3369783e0a3e0c06388cf59fddfd799811381a2b (diff) | |
| parent | 3c09c5f12d21258865677cf565bb9d53a8098d3a (diff) | |
| download | go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar.gz go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar.bz2 go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar.lz go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar.xz go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.tar.zst go-tangerine-475521dd747070372f84c2b0ac202e14216dc0e0.zip | |
Merge pull request #2909 from fjl/account-manager-cleanup
all: clean up tech debt left behind by the API split
Diffstat (limited to 'miner/worker.go')
| -rw-r--r-- | miner/worker.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/miner/worker.go b/miner/worker.go index dfda6d898..59406bf4e 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -60,7 +60,7 @@ type uint64RingBuffer struct { next int //where is the next insertion? assert 0 <= next < len(ints) } -// environment is the workers current environment and holds +// Work is the workers current environment and holds // all of the current state information type Work struct { config *core.ChainConfig @@ -105,7 +105,7 @@ type worker struct { recv chan *Result pow pow.PoW - eth core.Backend + eth Backend chain *core.BlockChain proc core.Validator chainDb ethdb.Database @@ -130,11 +130,11 @@ type worker struct { fullValidation bool } -func newWorker(config *core.ChainConfig, coinbase common.Address, eth core.Backend) *worker { +func newWorker(config *core.ChainConfig, coinbase common.Address, eth Backend, mux *event.TypeMux) *worker { worker := &worker{ config: config, eth: eth, - mux: eth.EventMux(), + mux: mux, chainDb: eth.ChainDb(), recv: make(chan *Result, resultQueueSize), gasPrice: new(big.Int), |