diff options
| author | obscuren <geffobscura@gmail.com> | 2014-07-07 16:53:25 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-07-07 16:53:25 +0800 |
| commit | 9dab7dcc3c99d387ad2c0a1623b574d3023bdfae (patch) | |
| tree | 8f98cce69568d29a954410e18dce8c121d25592e /ethchain | |
| parent | d40cba3042564f3471aa20a5cf477cafcacc2189 (diff) | |
| parent | b958179263aa1fa5060dd5d5848b8bb092a4165c (diff) | |
| download | go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.gz go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.bz2 go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.lz go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.xz go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.tar.zst go-tangerine-9dab7dcc3c99d387ad2c0a1623b574d3023bdfae.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/eth-go into develop
Diffstat (limited to 'ethchain')
| -rw-r--r-- | ethchain/dagger.go | 5 | ||||
| -rw-r--r-- | ethchain/state_manager.go | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ethchain/dagger.go b/ethchain/dagger.go index 4dda21ff5..adf1c2f05 100644 --- a/ethchain/dagger.go +++ b/ethchain/dagger.go @@ -3,6 +3,7 @@ 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" @@ -14,7 +15,7 @@ import ( var powlogger = ethlog.NewLogger("POW") type PoW interface { - Search(block *Block, reactChan chan ethutil.React) []byte + Search(block *Block, reactChan chan ethreact.Event) []byte Verify(hash []byte, diff *big.Int, nonce []byte) bool } @@ -22,7 +23,7 @@ type EasyPow struct { hash *big.Int } -func (pow *EasyPow) Search(block *Block, reactChan chan ethutil.React) []byte { +func (pow *EasyPow) Search(block *Block, reactChan chan ethreact.Event) []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 f3fd92913..52a73beb8 100644 --- a/ethchain/state_manager.go +++ b/ethchain/state_manager.go @@ -6,6 +6,7 @@ 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" @@ -36,7 +37,7 @@ type EthManager interface { BlockChain() *BlockChain TxPool() *TxPool Broadcast(msgType ethwire.MsgType, data []interface{}) - Reactor() *ethutil.ReactorEngine + Reactor() *ethreact.ReactorEngine PeerCount() int IsMining() bool IsListening() bool |