diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-15 01:50:06 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-15 01:50:06 +0800 |
| commit | 3d5db7288f134fef7e51b25776007705f6663654 (patch) | |
| tree | edda6e8fd23584327473058411df9cd2c53241f4 /ethminer/miner.go | |
| parent | dc11b5c55e2888a7a3dac51fedc3864d112136ce (diff) | |
| parent | 8845fb7eae3e51fd3e55c47c377bf1a9e0cfe2a9 (diff) | |
| download | dexon-3d5db7288f134fef7e51b25776007705f6663654.tar.gz dexon-3d5db7288f134fef7e51b25776007705f6663654.tar.zst dexon-3d5db7288f134fef7e51b25776007705f6663654.zip | |
merge upstream
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 8224c5441..71d4b2428 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/ethreact" + "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethwire" "sort" ) @@ -15,19 +15,19 @@ type Miner struct { pow ethchain.PoW ethereum ethchain.EthManager coinbase []byte - reactChan chan ethreact.Event + reactChan chan ethutil.React txs ethchain.Transactions uncles []*ethchain.Block block *ethchain.Block powChan chan []byte - powQuitChan chan ethreact.Event + powQuitChan chan ethutil.React quitChan chan bool } func NewDefaultMiner(coinbase []byte, ethereum ethchain.EthManager) Miner { - 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 + 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 quitChan := make(chan bool, 1) ethereum.Reactor().Subscribe("newBlock", reactChan) |