aboutsummaryrefslogtreecommitdiffstats
path: root/ethminer
diff options
context:
space:
mode:
authorzelig <viktor.tron@gmail.com>2014-07-15 08:11:06 +0800
committerzelig <viktor.tron@gmail.com>2014-07-15 08:11:06 +0800
commit1735ec0362e84455126d8c1bd380ecae436d1167 (patch)
treee017a42d66ceecc01f798f4ee926db5cc3011083 /ethminer
parent0ecc5c815e4550d7e8dca7b4ab4c549b10bf0b19 (diff)
downloaddexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar.gz
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar.bz2
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar.lz
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar.xz
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.tar.zst
dexon-1735ec0362e84455126d8c1bd380ecae436d1167.zip
use ethreact.Event and ethreact.ReactorEngine
Diffstat (limited to 'ethminer')
-rw-r--r--ethminer/miner.go12
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)