aboutsummaryrefslogtreecommitdiffstats
path: root/eth/backend.go
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-04-09 01:40:54 +0800
committerGitHub <noreply@github.com>2017-04-09 01:40:54 +0800
commitbadbaf66b6efe454ac02d0a6ce1ae964f7fa67c0 (patch)
treeffa8ffe28b6e7539cfd9baa6aa0b3c48522b91fc /eth/backend.go
parentcc13d576f07fb6803e09fb42880591a67b8b0ef6 (diff)
parentb801be99d47ba09121a3e7d14aa028f828525b61 (diff)
downloaddexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar.gz
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar.bz2
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar.lz
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar.xz
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.tar.zst
dexon-badbaf66b6efe454ac02d0a6ce1ae964f7fa67c0.zip
Merge pull request #13880 from karalabe/remote-miner-fix
consensus/ethash, eth: don't mine if 0 threads are set
Diffstat (limited to 'eth/backend.go')
-rw-r--r--eth/backend.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/eth/backend.go b/eth/backend.go
index f241d5f34..df5460201 100644
--- a/eth/backend.go
+++ b/eth/backend.go
@@ -240,8 +240,10 @@ func CreateConsensusEngine(ctx *node.ServiceContext, config *Config, chainConfig
log.Warn("Ethash used in shared mode")
return ethash.NewShared()
default:
- return ethash.New(ctx.ResolvePath(config.EthashCacheDir), config.EthashCachesInMem, config.EthashCachesOnDisk,
+ engine := ethash.New(ctx.ResolvePath(config.EthashCacheDir), config.EthashCachesInMem, config.EthashCachesOnDisk,
config.EthashDatasetDir, config.EthashDatasetsInMem, config.EthashDatasetsOnDisk)
+ engine.SetThreads(-1) // Disable CPU mining
+ return engine
}
}