diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-07 16:53:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-07 16:53:25 +0800 |
| commit | 9dab7dcc3c99d387ad2c0a1623b574d3023bdfae (patch) | |
| tree | 8f98cce69568d29a954410e18dce8c121d25592e /ethminer/miner.go | |
| parent | d40cba3042564f3471aa20a5cf477cafcacc2189 (diff) | |
| parent | b958179263aa1fa5060dd5d5848b8bb092a4165c (diff) | |
| download | dexon-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.gz dexon-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.zst dexon-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethminer/miner.go')
| -rw-r--r-- | ethminer/miner.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ethminer/miner.go b/ethminer/miner.go index 71d4b2428..8224c5441 100644 --- a/ethminer/miner.go +++ b/ethminer/miner.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethlog" - "github.com/ethereum/eth-go/ethutil" + "github.com/ethereum/eth-go/ethreact" "github.com/ethereum/eth-go/ethwire" "sort" ) @@ -15,19 +15,19 @@ type Miner struct { pow ethchain.PoW ethereum ethchain.EthManager coinbase []byte - reactChan chan ethutil.React + reactChan chan ethreact.Event txs ethchain.Transactions uncles []*ethchain.Block block *ethchain.Block powChan chan []byte - powQuitChan chan ethutil.React + powQuitChan chan ethreact.Event quitChan chan bool } func NewDefaultMiner(coinbase []byte, ethereum ethchain.EthManager) Miner { - reactChan := make(chan ethutil.React, 1) // This is the channel that receives 'updates' when ever a new transaction or block comes in - powChan := make(chan []byte, 1) // This is the channel that receives valid sha hases for a given block - powQuitChan := make(chan ethutil.React, 1) // This is the channel that can exit the miner thread + reactChan := make(chan ethreact.Event, 1) // This is the channel that receives 'updates' when ever a new transaction or block comes in + powChan := make(chan []byte, 1) // This is the channel that receives valid sha hases for a given block + powQuitChan := make(chan ethreact.Event, 1) // This is the channel that can exit the miner thread quitChan := make(chan bool, 1) ethereum.Reactor().Subscribe("newBlock", reactChan) |