diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 01:13:35 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 02:58:43 +0800 |
| commit | ac695387075fdd9214ef8de71ac6897136a50ce8 (patch) | |
| tree | 5a4bce7c79eebe56b3573892e30e96b1ed0936fd /core | |
| parent | 9d2166a964d83c09481dea6ef30889f260249295 (diff) | |
| parent | db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 (diff) | |
| download | go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.gz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.bz2 go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.lz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.xz go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.tar.zst go-tangerine-ac695387075fdd9214ef8de71ac6897136a50ce8.zip | |
Merge branch 'develop' into miner
Diffstat (limited to 'core')
| -rw-r--r-- | core/block_processor.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/core/block_processor.go b/core/block_processor.go index d59d7feca..a69ff1824 100644 --- a/core/block_processor.go +++ b/core/block_processor.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/ethereum/c-ethash/go-ethash" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" @@ -14,7 +15,7 @@ import ( "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/pow" - "github.com/ethereum/go-ethereum/pow/ezp" + _ "github.com/ethereum/go-ethereum/pow/ezp" "github.com/ethereum/go-ethereum/state" "gopkg.in/fatih/set.v0" ) @@ -62,7 +63,7 @@ func NewBlockProcessor(db ethutil.Database, txpool *TxPool, chainManager *ChainM sm := &BlockProcessor{ db: db, mem: make(map[string]*big.Int), - Pow: ezp.New(), + Pow: ðash.Ethash{}, bc: chainManager, eventMux: eventMux, txpool: txpool, |