diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:52:02 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:52:02 +0800 |
| commit | b958179263aa1fa5060dd5d5848b8bb092a4165c (patch) | |
| tree | 9ea81946396fc584c8c8a0b64d9e9f9fff43b17a /ethminer/miner.go | |
| parent | b232acd04ef957fb65e1c49b330165535da7e871 (diff) | |
| parent | 5a2afc575485e2d651b9840f5d1ea080cdc72fa7 (diff) | |
| download | go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar.gz go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar.bz2 go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar.lz go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar.xz go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.tar.zst go-tangerine-b958179263aa1fa5060dd5d5848b8bb092a4165c.zip | |
Merge pull request #33 from ethersphere/feature/ethutil-refactor
ethreact - Feature/ethutil refactor
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) |