Consolidated stratum and getwork within libpoolprotocols

Author: smurfy

CMakeLists.txt

@@ -142,8 +142,7 @@ add_subdirectory(libdevcore)
 add_subdirectory(libethash)
 add_subdirectory(libethcore)
 add_subdirectory(libhwmon)
-add_subdirectory(libstratum)
-add_subdirectory(libgetwork)
+add_subdirectory(libpoolprotocols)
 
 if (ETHASHCL)
 	add_subdirectory(libethash-cl)

ethminer/CMakeLists.txt

@@ -14,7 +14,7 @@ add_dependencies(${EXECUTABLE} BuildInfo.h)
 
 target_link_libraries(${EXECUTABLE} ethcore)
 target_link_libraries(${EXECUTABLE} ethash)
-target_link_libraries(${EXECUTABLE} ethstratum devcore libjson-rpc-cpp::client)
+target_link_libraries(${EXECUTABLE} poolprotocols devcore libjson-rpc-cpp::client)
 
 if(ETHDBUS)
 	find_package(PkgConfig)
@@ -29,9 +29,6 @@ if(APICORE)
 	target_link_libraries(${EXECUTABLE} apicore)
 endif()
 
-target_link_libraries(${EXECUTABLE} ethstratum)
-target_link_libraries(${EXECUTABLE} ethgetwork)
-
 include(GNUInstallDirs)
 install(TARGETS ethminer DESTINATION ${CMAKE_INSTALL_BINDIR})
 if(MSVC)

ethminer/MinerAux.h

@@ -43,10 +43,10 @@
 #if ETH_ETHASHCUDA
 #include <libethash-cuda/CUDAMiner.h>
 #endif
-#include <libethcore/PoolManager.h>
-#include <libstratum/EthStratumClient.h>
-#include <libstratum/EthStratumClientV2.h>
-#include <libgetwork/EthGetworkClient.h>
+#include <libpoolprotocols/PoolManager.h>
+#include <libpoolprotocols/stratum/EthStratumClient.h>
+#include <libpoolprotocols/stratum/EthStratumClientV2.h>
+#include <libpoolprotocols/getwork/EthGetworkClient.h>
 
 #if ETH_DBUS
 #include "DBusInt.h"

libethcore/CMakeLists.txt

@@ -4,8 +4,6 @@ set(SOURCES
 	Exceptions.h
 	Farm.h
 	Miner.h Miner.cpp
-	PoolManager.h PoolManager.cpp
-	PoolClient.h PoolClient.cpp
 )
 
 include_directories(BEFORE ..)

libgetwork/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(SOURCES
+	PoolClient.h PoolClient.cpp
+	PoolManager.h PoolManager.cpp
+    stratum/EthStratumClient.h stratum/EthStratumClient.cpp
+    getwork/EthGetworkClient.h getwork/EthGetworkClient.cpp getwork/jsonrpc_getwork.h
+)
+
+add_library(poolprotocols ${SOURCES})
+target_link_libraries(poolprotocols libjson-rpc-cpp::client)
+target_link_libraries(poolprotocols devcore Boost::system jsoncpp_lib_static)
+target_include_directories(poolprotocols PRIVATE ..)

libpoolprotocols/CMakeLists.txt

@@ -1,8 +1,8 @@
 #ifndef POOL_CLIENT_H_
 #define POOL_CLIENT_H_
 
-#include "Farm.h"
-#include "Miner.h"
+#include <libethcore/Farm.h>
+#include <libethcore/Miner.h>
 
 using namespace std;
 

libethcore/PoolClient.cpp libpoolprotocols/PoolClient.cpp

@@ -3,8 +3,9 @@
 
 #include <iostream>
 #include <libdevcore/Worker.h>
-#include "Farm.h"
-#include "Miner.h"
+#include <libethcore/Farm.h>
+#include <libethcore/Miner.h>
+
 #include "PoolClient.h"
 #if ETH_DBUS
 #include "DBusInt.h"

libethcore/PoolClient.h libpoolprotocols/PoolClient.h

@@ -2,10 +2,10 @@
 #define ETH_GETWORK_CLIENT_H_
 
 #include <jsonrpccpp/client/connectors/httpclient.h>
-#include <libethcore/PoolClient.h>
 #include <iostream>
 #include <libdevcore/Worker.h>
 #include "jsonrpc_getwork.h"
+#include "../PoolClient.h"
 
 using namespace std;
 using namespace dev;