Remove "wait state"

n15e · Jul 20, 2017 · 50a97ff · 50a97ff
1 parent 2c8f46f
commit 50a97ff
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/ethminer/MinerAux.h b/ethminer/MinerAux.h
@@ -920,7 +920,7 @@ class MinerCLI
 					{
 						minelog << "Mining on" << client.currentHeaderHash() << ": " << mp << f.getSolutionStats();
 					}
-					else if (client.waitState() == MINER_WAIT_STATE_WORK)
+					else
 					{
 						minelog << "Waiting for work package...";
 					}

diff --git a/libethcore/Miner.h b/libethcore/Miner.h
@@ -31,9 +31,7 @@
 #include <libdevcore/Worker.h>
 #include "EthashAux.h"
 
-#define MINER_WAIT_STATE_UNKNOWN 0
 #define MINER_WAIT_STATE_WORK	 1
-#define MINER_WAIT_STATE_DAG	 2
 
 
 #define DAG_LOAD_MODE_PARALLEL	 0

diff --git a/libstratum/EthStratumClient.h b/libstratum/EthStratumClient.h
@@ -31,7 +31,6 @@ class EthStratumClient
 	bool isConnected() { return m_connected && m_authorized; }
 	h256 currentHeaderHash() { return m_current.header; }
 	bool current() { return m_current; }
-	unsigned waitState() { return m_waitState; }
 	bool submit(Solution solution);
 	void reconnect();
 private:
@@ -63,8 +62,6 @@ class EthStratumClient
 	int	m_maxRetries;
 	int m_worktimeout = 60;
 
-	int m_waitState = MINER_WAIT_STATE_WORK;
-
 	std::mutex x_pending;
 	int m_pending;
-Original file line number
+Diff line change
@@ Expand Up / @@ -920,7 +920,7 @@ class MinerCLI @@
     					{
     						minelog << "Mining on" << client.currentHeaderHash() << ": " << mp << f.getSolutionStats();
     					}
-    					else if (client.waitState() == MINER_WAIT_STATE_WORK)
+    					else
     					{
     						minelog << "Waiting for work package...";
     					}
@@ Expand Down @@