Remove Miner::submitProof() wrapper

n15e · Jul 20, 2017 · 8650f6d · 8650f6d
1 parent 90d91de
commit 8650f6d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/libethash-cl/CLMiner.cpp b/libethash-cl/CLMiner.cpp
@@ -130,7 +130,7 @@ void CLMiner::report(uint64_t _nonce)
 	// TODO: Why re-evaluating?
 	Result r = EthashAux::eval(w.seed, w.header, _nonce);
 	if (r.value < w.boundary)
-		submitProof(Solution{_nonce, r.mixHash, w.header, w.seed, w.boundary});
+		farm().submitProof(Solution{_nonce, r.mixHash, w.header, w.seed, w.boundary});
 	else
 		cwarn << "Invalid solution";
 }

diff --git a/libethcore/EthashCUDAMiner.cpp b/libethcore/EthashCUDAMiner.cpp
@@ -117,7 +117,7 @@ void EthashCUDAMiner::report(uint64_t _nonce)
 	WorkPackage w = work();  // Copy work package to avoid repeated mutex lock.
 	Result r = EthashAux::eval(w.seed, w.header, _nonce);
 	if (r.value < w.boundary)
-		submitProof(Solution{_nonce, r.mixHash, w.header, w.seed, w.boundary});
+		farm().submitProof(Solution{_nonce, r.mixHash, w.header, w.seed, w.boundary});
 }
 
 void EthashCUDAMiner::kickOff()

diff --git a/libethcore/Miner.h b/libethcore/Miner.h
@@ -173,9 +173,6 @@ class Miner: public Worker
 
 protected:
 
-
-	// REQUIRED TO BE REIMPLEMENTED BY A SUBCLASS:
-
 	/**
 	 * @brief Begin working on a given work package, discarding any previous work.
 	 * @param _work The package for which to find a solution.
@@ -187,16 +184,7 @@ class Miner: public Worker
 	 */
 	virtual void pause() = 0;
 
-	// AVAILABLE FOR A SUBCLASS TO CALL:
-
-	/**
-	 * @brief Notes that the Miner found a solution.
-	 * @param _s The solution.
-	 */
-	void submitProof(Solution const& _s)
-	{
-		m_farm.submitProof(_s);
-	}
+	FarmFace& farm() { return m_farm; }
 
 	WorkPackage const& work() const { Guard l(x_work); return m_work; }