Remove CommonJS.h

ethminer/MinerAux.h

@@ -35,7 +35,6 @@
 
 #include <libethcore/Exceptions.h>
 #include <libdevcore/SHA3.h>
-#include <libdevcore/CommonJS.h>
 #include <libethcore/EthashAux.h>
 #include <libethcore/EthashCUDAMiner.h>
 #include <libethcore/EthashGPUMiner.h>
@@ -69,6 +68,14 @@ struct MiningChannel: public LogChannel
 };
 #define minelog clog(MiningChannel)
 
+inline std::string toJS(unsigned long _n)
+{
+	std::string h = toHex(toCompactBigEndian(_n, 1));
+	// remove first 0, if it is necessary;
+	std::string res = h[0] != '0' ? h : h.substr(1);
+	return "0x" + res;
+}
+
 class MinerCLI
 {
 public:
@@ -250,7 +257,7 @@ public:
 				{
 					m_openclDevices[m_openclDeviceCount] = stol(argv[++i]);
 					++m_openclDeviceCount;
-                }
+				}
 				catch (...)
 				{
 					i--;
@@ -335,21 +342,6 @@ public:
 				BOOST_THROW_EXCEPTION(BadArgument());
 			}
 		}
-		/*
-		else if (arg == "--phone-home" && i + 1 < argc)
-		{
-			string m = argv[++i];
-			if (isTrue(m))
-				m_phoneHome = true;
-			else if (isFalse(m))
-				m_phoneHome = false;
-			else
-			{
-				cerr << "Bad " << arg << " option: " << m << endl;
-				BOOST_THROW_EXCEPTION(BadArgument());
-			}
-		}
-		*/
 		else if (arg == "--benchmark-warmup" && i + 1 < argc)
 			try {
 				m_benchmarkWarmup = stol(argv[++i]);
@@ -820,7 +812,7 @@ private:
 
 					try
 					{
-						prpc->eth_submitHashrate(toJS((u256)rate), "0x" + id.hex());
+						prpc->eth_submitHashrate(toJS(rate), "0x" + id.hex());
 					}
 					catch (jsonrpc::JsonRpcException const& _e)
 					{

libdevcore/CommonJS.h

@@ -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 CommonJS.h
- * @authors:
- *   Gav Wood <i@gavwood.com>
- *   Marek Kotewicz <marek@ethdev.com>
- * @date 2014
- */
-
-#pragma once
-
-#include <string>
-#include "FixedHash.h"
-#include "CommonData.h"
-
-namespace dev
-{
-
-template <unsigned N> std::string toJS(boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N, N, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> const& _n)
-{
-	std::string h = toHex(toCompactBigEndian(_n, 1));
-	// remove first 0, if it is necessary;
-	std::string res = h[0] != '0' ? h : h.substr(1);
-	return "0x" + res;
-}
-
-template <unsigned N> boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>> jsToInt(std::string const& _s)
-{
-	if (_s.substr(0, 2) == "0x")
-		// Hex
-		return fromBigEndian<boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>>(fromHex(_s.substr(2)));
-	else if (_s.find_first_not_of("0123456789") == std::string::npos)
-		// Decimal
-		return boost::multiprecision::number<boost::multiprecision::cpp_int_backend<N * 8, N * 8, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>(_s);
-	else
-		// Binary
-		return 0;			// FAIL
-}
-
-}