all: swap out the C++ ethash to the pure Go one (mining todo)

3 files changed, 8 insertions, 6 deletions

diff --git a/eth/backend.go b/eth/backend.go
index 5a8b41f5d..024520b13 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -288,15 +288,15 @@ func CreatePoW(config *Config) (pow.PoW, error) {
 	switch {
 	case config.PowFake:
 		log.Warn("Ethash used in fake mode")
-		return pow.PoW(core.FakePow{}), nil
+		return pow.FakePow{}, nil
 	case config.PowTest:
 		log.Warn("Ethash used in test mode")
-		return ethash.NewForTesting()
+		return pow.NewTestEthash(), nil
 	case config.PowShared:
 		log.Warn("Ethash used in shared mode")
-		return ethash.NewShared(), nil
+		return pow.NewSharedEthash(), nil
 	default:
-		return ethash.New(), nil
+		return pow.NewFullEthash("", ""), nil
 	}
 }
 
diff --git a/eth/handler_test.go b/eth/handler_test.go
index 03d5404a4..683c8f71e 100644
--- a/eth/handler_test.go
+++ b/eth/handler_test.go
@@ -34,6 +34,7 @@ import (
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/pow"
 )
 
 var bigTxGas = new(big.Int).SetUint64(params.TxGas)
@@ -468,7 +469,7 @@ func testDAOChallenge(t *testing.T, localForked, remoteForked bool, timeout bool
 	// Create a DAO aware protocol manager
 	var (
 		evmux         = new(event.TypeMux)
-		pow           = new(core.FakePow)
+		pow           = new(pow.FakePow)
 		db, _         = ethdb.NewMemDatabase()
 		genesis       = core.WriteGenesisBlockForTesting(db)
 		config        = &params.ChainConfig{DAOForkBlock: big.NewInt(1), DAOForkSupport: localForked}
diff --git a/eth/helper_test.go b/eth/helper_test.go
index 0861c884b..3ad31394a 100644
--- a/eth/helper_test.go
+++ b/eth/helper_test.go
@@ -37,6 +37,7 @@ import (
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/discover"
 	"github.com/ethereum/go-ethereum/params"
+	"github.com/ethereum/go-ethereum/pow"
 )
 
 var (
@@ -53,7 +54,7 @@ var (
 func newTestProtocolManager(fastSync bool, blocks int, generator func(int, *core.BlockGen), newtx chan<- []*types.Transaction) (*ProtocolManager, error) {
 	var (
 		evmux         = new(event.TypeMux)
-		pow           = new(core.FakePow)
+		pow           = new(pow.FakePow)
 		db, _         = ethdb.NewMemDatabase()
 		genesis       = core.WriteGenesisBlockForTesting(db, testBank)
 		chainConfig   = &params.ChainConfig{HomesteadBlock: big.NewInt(0)} // homestead set to 0 because of chain maker