aboutsummaryrefslogtreecommitdiffstats
path: root/ethminer
diff options
context:
space:
mode:
authorJeffrey Wilcke <obscuren@users.noreply.github.com>2014-07-07 16:59:16 +0800
committerJeffrey Wilcke <obscuren@users.noreply.github.com>2014-07-07 16:59:16 +0800
commit6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1 (patch)
treeb8b1218e456d3daaad4a36e6ba022323c3762038 /ethminer
parent9dab7dcc3c99d387ad2c0a1623b574d3023bdfae (diff)
downloaddexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar.gz
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar.bz2
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar.lz
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar.xz
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.tar.zst
dexon-6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1.zip
Revert "ethreact - Feature/ethutil refactor"
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 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)