From b1cc9cdc7424d452687e2e168027d591ed332f3f Mon Sep 17 00:00:00 2001 From: Gustav Simonsson Date: Tue, 5 May 2015 08:24:15 +0200 Subject: Integrate new ethash API and change geth makedag cmd --- miner/agent.go | 2 +- miner/miner.go | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'miner') diff --git a/miner/agent.go b/miner/agent.go index 547fdfbef..b2f89aaab 100644 --- a/miner/agent.go +++ b/miner/agent.go @@ -85,7 +85,7 @@ func (self *CpuMiner) mine(block *types.Block) { self.chMu.Unlock() // Mine - nonce, mixDigest, _ := self.pow.Search(block, self.quitCurrentOp) + nonce, mixDigest := self.pow.Search(block, self.quitCurrentOp) if nonce != 0 { block.SetNonce(nonce) block.Header().MixDigest = common.BytesToHash(mixDigest) diff --git a/miner/miner.go b/miner/miner.go index 883956370..bff0026dc 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -3,7 +3,6 @@ package miner import ( "math/big" - "github.com/ethereum/ethash" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" @@ -41,13 +40,7 @@ func (self *Miner) Mining() bool { func (self *Miner) Start(coinbase common.Address) { self.mining = true self.worker.coinbase = coinbase - - if self.threads > 0 { - self.pow.(*ethash.Ethash).UpdateDAG() - } - self.worker.start() - self.worker.commitNewWork() } -- cgit v1.2.3