From b801be99d47ba09121a3e7d14aa028f828525b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Fri, 7 Apr 2017 17:22:06 +0300
Subject: consensus, eth: don't CPU mine by default during remote mining

---
 eth/api.go | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'eth/api.go')

diff --git a/eth/api.go b/eth/api.go
index 041ccd397..947070515 100644
--- a/eth/api.go
+++ b/eth/api.go
@@ -139,16 +139,17 @@ func NewPrivateMinerAPI(e *Ethereum) *PrivateMinerAPI {
 // threads allowed to use.
 func (api *PrivateMinerAPI) Start(threads *int) error {
 	// Set the number of threads if the seal engine supports it
-	if threads != nil {
-		type threaded interface {
-			SetThreads(threads int)
-		}
-		if th, ok := api.e.engine.(threaded); ok {
-			log.Info("Updated mining threads", "threads", *threads)
-			th.SetThreads(*threads)
-		} else {
-			log.Warn("Current seal engine isn't threaded")
-		}
+	if threads == nil {
+		threads = new(int)
+	} else if *threads == 0 {
+		*threads = -1 // Disable the miner from within
+	}
+	type threaded interface {
+		SetThreads(threads int)
+	}
+	if th, ok := api.e.engine.(threaded); ok {
+		log.Info("Updated mining threads", "threads", *threads)
+		th.SetThreads(*threads)
 	}
 	// Start the miner and return
 	if !api.e.IsMining() {
@@ -159,6 +160,12 @@ func (api *PrivateMinerAPI) Start(threads *int) error {
 
 // Stop the miner
 func (api *PrivateMinerAPI) Stop() bool {
+	type threaded interface {
+		SetThreads(threads int)
+	}
+	if th, ok := api.e.engine.(threaded); ok {
+		th.SetThreads(-1)
+	}
 	api.e.StopMining()
 	return true
 }
-- 
cgit v1.2.3