Merge pull request #30 from ethereum-mining/remove-code

Remove unused EthashSealEngine class

ethminer/MinerAux.h

@@ -608,7 +608,7 @@ private:
 
 	void doBenchmark(MinerType _m, unsigned _warmupDuration = 15, unsigned _trialDuration = 3, unsigned _trials = 5)
 	{
-		Ethash::BlockHeader genesis;
+		BlockHeader genesis;
 		genesis.setNumber(m_benchmarkBlock);
 		genesis.setDifficulty(1 << 18);
 		cdebug << genesis.boundary();
@@ -674,7 +674,7 @@ private:
 
 	void doSimulation(MinerType _m, int difficulty = 20)
 	{
-		Ethash::BlockHeader genesis;
+		BlockHeader genesis;
 		genesis.setNumber(m_benchmarkBlock);
 		genesis.setDifficulty(1 << 18);
 		cdebug << genesis.boundary();

libethcore/BlockInfo.h

@@ -221,5 +221,26 @@ public:
 	}
 };
 
+class BlockHeaderRaw: public BlockInfo
+{
+public:
+	h256 const& seedHash() const;
+	Nonce const& nonce() const { return m_nonce; }
+
+protected:
+	BlockHeaderRaw() = default;
+	BlockHeaderRaw(BlockInfo const& _bi): BlockInfo(_bi) {}
+
+	void clear() { m_mixHash = h256(); m_nonce = Nonce(); }
+
+private:
+	Nonce m_nonce;
+	h256 m_mixHash;
+
+	mutable h256 m_seedHash;
+};
+
+using BlockHeader = BlockHeaderPolished<BlockHeaderRaw>;
+
 }
 }

libethcore/CMakeLists.txt

@@ -3,16 +3,13 @@ file(GLOB HEADERS "*.h")
 
 include_directories(BEFORE ..)
 
-if (ETHASHCUDA)
-	include_directories(${CUDA_INCLUDE_DIRS})
-endif ()
-
 add_library(ethcore ${SOURCES} ${HEADERS})
 target_link_libraries(ethcore ethash devcore)
 
-if (ETHASHCL)
+if(ETHASHCL)
 	target_link_libraries(ethcore ethash-cl)
-endif ()
-if (ETHASHCUDA)
+endif()
+if(ETHASHCUDA)
+	target_include_directories(ethcore PRIVATE ${CUDA_INCLUDE_DIRS})
 	target_link_libraries(ethcore ethash-cuda)
-endif ()
+endif()

libethcore/Ethash.cpp

@@ -1,38 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file Ethash.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- */
-
-#include "Ethash.h"
-#include "EthashAux.h"
-
-namespace dev
-{
-namespace eth
-{
-
-h256 const& Ethash::BlockHeaderRaw::seedHash() const
-{
-	if (!m_seedHash)
-		m_seedHash = EthashAux::seedHash((unsigned)m_number);
-	return m_seedHash;
-}
-
-}
-}

libethcore/Ethash.h

@@ -1,78 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file Ethash.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * A proof of work algorithm.
- */
-
-#pragma once
-
-#include <chrono>
-#include <thread>
-#include <cstdint>
-#include "Common.h"
-#include "Miner.h"
-#include "Farm.h"
-
-class ethash_cl_miner;
-class ethash_cuda_miner;
-
-namespace dev
-{
-
-class RLP;
-class RLPStream;
-
-namespace eth
-{
-
-class BlockInfo;
-class EthashCLHook;
-class EthashCUDAHook;
-
-class Ethash
-{
-public:
-	using Nonce = h64;
-
-	class BlockHeaderRaw: public BlockInfo
-	{
-		friend class EthashSealEngine;
-
-	public:
-		h256 const& seedHash() const;
-		Nonce const& nonce() const { return m_nonce; }
-
-	protected:
-		BlockHeaderRaw() = default;
-		BlockHeaderRaw(BlockInfo const& _bi): BlockInfo(_bi) {}
-
-		void clear() { m_mixHash = h256(); m_nonce = Nonce(); }
-
-	private:
-		Nonce m_nonce;
-		h256 m_mixHash;
-
-		mutable h256 m_seedHash;
-	};
-	using BlockHeader = BlockHeaderPolished<BlockHeaderRaw>;
-};
-
-}
-}

libethcore/EthashAux.cpp

@@ -33,6 +33,7 @@
 #include <libethash/io.h>
 #include "BlockInfo.h"
 #include "Exceptions.h"
+
 using namespace std;
 using namespace chrono;
 using namespace dev;
@@ -48,8 +49,11 @@ const unsigned EthashProofOfWork::defaultGlobalWorkSizeMultiplier = 4096; // * C
 const unsigned EthashProofOfWork::defaultMSPerBatch = 0;
 const EthashProofOfWork::WorkPackage EthashProofOfWork::NullWorkPackage = EthashProofOfWork::WorkPackage();
 
-EthashAux::~EthashAux()
+h256 const& BlockHeaderRaw::seedHash() const
 {
+	if (!m_seedHash)
+		m_seedHash = EthashAux::seedHash((unsigned)m_number);
+	return m_seedHash;
 }
 
 EthashAux* EthashAux::get()

libethcore/EthashAux.h

@@ -25,14 +25,13 @@
 #include <libethash/ethash.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Worker.h>
-#include "Ethash.h"
+#include "BlockInfo.h"
 
 namespace dev
 {
 namespace eth
 {
 
-
 struct DAGChannel: public LogChannel { static const char* name(); static const int verbosity = 1; };
 
 /// Proof of work definition for Ethash.
@@ -53,7 +52,7 @@ struct EthashProofOfWork
 	struct WorkPackage
 	{
 		WorkPackage() = default;
-		WorkPackage(Ethash::BlockHeader const& _bh) :
+		WorkPackage(BlockHeader const& _bh) :
 			boundary(_bh.boundary()),
 			headerHash(_bh.hashWithout()),
 			seedHash(_bh.seedHash())
@@ -91,8 +90,6 @@ enum class DAGEraseMode
 class EthashAux
 {
 public:
-	~EthashAux();
-
 	static EthashAux* get();
 
 	struct LightAllocation

libethcore/EthashCUDAMiner.h

@@ -28,10 +28,14 @@ along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
 #include "EthashAux.h"
 #include "Miner.h"
 
+class ethash_cuda_miner;
+
 namespace dev
 {
 namespace eth
 {
+class EthashCUDAHook;
+
 	class EthashCUDAMiner : public GenericMiner<EthashProofOfWork>, Worker
 	{
 		friend class dev::eth::EthashCUDAHook;

libethcore/EthashGPUMiner.cpp

@@ -27,6 +27,7 @@
 #include <thread>
 #include <chrono>
 #include <libethash-cl/ethash_cl_miner.h>
+
 using namespace std;
 using namespace dev;
 using namespace eth;

libethcore/EthashGPUMiner.h

@@ -24,14 +24,17 @@
 #pragma once
 #if ETH_ETHASHCL
 
-#include "libdevcore/Worker.h"
+#include <libdevcore/Worker.h>
 #include "EthashAux.h"
 #include "Miner.h"
 
+class ethash_cl_miner;
+
 namespace dev
 {
 namespace eth
 {
+class EthashCLHook;
 
 class EthashGPUMiner: public GenericMiner<EthashProofOfWork>, Worker
 {

libethcore/EthashSealEngine.cpp

@@ -1,54 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file EthashSealEngine.cpp
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * Determines the PoW algorithm.
- */
-
-#include "EthashSealEngine.h"
-#include "EthashGPUMiner.h"
-#include "EthashCUDAMiner.h"
-using namespace std;
-using namespace dev;
-using namespace eth;
-
-EthashSealEngine::EthashSealEngine()
-{
-	map<string, GenericFarm<EthashProofOfWork>::SealerDescriptor> sealers;
-#if ETH_ETHASHCL
-	sealers["opencl"] = GenericFarm<EthashProofOfWork>::SealerDescriptor{&EthashGPUMiner::instances, [](GenericMiner<EthashProofOfWork>::ConstructionInfo ci){ return new EthashGPUMiner(ci); }};
-#endif
-#if ETH_ETHASHCUDA
-	sealers["cuda"] = GenericFarm<EthashProofOfWork>::SealerDescriptor{ &EthashCUDAMiner::instances, [](GenericMiner<EthashProofOfWork>::ConstructionInfo ci){ return new EthashCUDAMiner(ci); } };
-#endif
-	m_farm.setSealers(sealers);
-}
-
-strings EthashSealEngine::sealers() const
-{
-	return {
-		"cpu"
-#if ETH_ETHASHCL
-		, "opencl"
-#endif
-#if ETH_ETHASHCUDA
-		, "cuda"
-#endif
-	};
-}

libethcore/EthashSealEngine.h

@@ -1,48 +0,0 @@
-/*
-	This file is part of cpp-ethereum.
-
-	cpp-ethereum is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-
-	cpp-ethereum is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-
-	You should have received a copy of the GNU General Public License
-	along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
-*/
-/** @file EthashSealEngine.h
- * @author Gav Wood <i@gavwood.com>
- * @date 2014
- *
- * Determines the PoW algorithm.
- */
-
-#pragma once
-
-#include "Ethash.h"
-#include "EthashAux.h"
-
-namespace dev
-{
-namespace eth
-{
-
-class EthashSealEngine
-{
-	friend class Ethash;
-
-public:
-	EthashSealEngine();
-
-	strings sealers() const;
-
-private:
-	eth::GenericFarm<EthashProofOfWork> m_farm;
-};
-
-}
-}