diff options
| author | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:59:26 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <obscuren@users.noreply.github.com> | 2014-07-07 16:59:26 +0800 |
| commit | 239a5d3230f29e1309ef9f00aa19a1e4f537afd4 (patch) | |
| tree | b8b1218e456d3daaad4a36e6ba022323c3762038 /ethchain | |
| parent | 9dab7dcc3c99d387ad2c0a1623b574d3023bdfae (diff) | |
| parent | 6fe9b4ab5e839be96eb1c4a619bc14fab622d8d1 (diff) | |
| download | dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar.gz dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar.bz2 dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar.lz dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar.xz dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.tar.zst dexon-239a5d3230f29e1309ef9f00aa19a1e4f537afd4.zip | |
Merge pull request #34 from ethereum/revert-33-feature/ethutil-refactor
Revert "ethreact - Feature/ethutil refactor"
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/dagger.go | 5 | ||||
| -rw-r--r-- | ethchain/state_manager.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ethchain/dagger.go b/ethchain/dagger.go index adf1c2f05..4dda21ff5 100644 --- a/ethchain/dagger.go +++ b/ethchain/dagger.go @@ -3,7 +3,6 @@ package ethchain import ( "github.com/ethereum/eth-go/ethcrypto" "github.com/ethereum/eth-go/ethlog" - "github.com/ethereum/eth-go/ethreact" "github.com/ethereum/eth-go/ethutil" "github.com/obscuren/sha3" "hash" @@ -15,7 +14,7 @@ import ( var powlogger = ethlog.NewLogger("POW") type PoW interface { - Search(block *Block, reactChan chan ethreact.Event) []byte + Search(block *Block, reactChan chan ethutil.React) []byte Verify(hash []byte, diff *big.Int, nonce []byte) bool } @@ -23,7 +22,7 @@ type EasyPow struct { hash *big.Int } -func (pow *EasyPow) Search(block *Block, reactChan chan ethreact.Event) []byte { +func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte { r := rand.New(rand.NewSource(time.Now().UnixNano())) hash := block.HashNoNonce() diff := block.Difficulty diff --git a/ethchain/state_manager.go b/ethchain/state_manager.go index 52a73beb8..f3fd92913 100644 --- a/ethchain/state_manager.go +++ b/ethchain/state_manager.go @@ -6,7 +6,6 @@ import ( "fmt" "github.com/ethereum/eth-go/ethcrypto" "github.com/ethereum/eth-go/ethlog" - "github.com/ethereum/eth-go/ethreact" "github.com/ethereum/eth-go/ethtrie" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/eth-go/ethwire" @@ -37,7 +36,7 @@ type EthManager interface { BlockChain() *BlockChain TxPool() *TxPool Broadcast(msgType ethwire.MsgType, data []interface{}) - Reactor() *ethreact.ReactorEngine + Reactor() *ethutil.ReactorEngine PeerCount() int IsMining() bool IsListening() bool |