Remove ethcore/Common.h header

Author: chfast

libethcore/BlockInfo.cpp

@@ -22,7 +22,6 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/RLP.h>
-#include <libethcore/Common.h>
 #include "EthashAux.h"
 #include "Exceptions.h"
 #include "BlockInfo.h"

libethcore/BlockInfo.h

@@ -24,14 +24,23 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/RLP.h>
 #include <libdevcore/SHA3.h>
-#include "Common.h"
 #include "Exceptions.h"
 
 namespace dev
 {
 namespace eth
 {
 
+/// An Ethereum address: 20 bytes.
+using Address = h160;
+
+/// The log bloom's size (2048-bit).
+using LogBloom = h2048;
+
+using Nonce = h64;
+
+using BlockNumber = unsigned;
+
 enum IncludeProof
 {
 	WithoutProof = 0,

libethcore/Common.h

@@ -22,7 +22,6 @@
 #pragma once
 
 #include <libdevcore/Exceptions.h>
-#include "Common.h"
 
 namespace dev
 {

libethcore/Exceptions.h

@@ -26,7 +26,6 @@
 #include <atomic>
 #include <libdevcore/Common.h>
 #include <libdevcore/Worker.h>
-#include <libethcore/Common.h>
 #include <libethcore/Miner.h>
 #include <libethcore/BlockInfo.h>
 

libethcore/Farm.h

@@ -29,7 +29,6 @@
 #include <libdevcore/Common.h>
 #include <libdevcore/Log.h>
 #include <libdevcore/Worker.h>
-#include <libethcore/Common.h>
 #include "EthashAux.h"
 
 #define MINER_WAIT_STATE_UNKNOWN 0
@@ -68,6 +67,14 @@ enum class MinerType
 	Mixed
 };
 
+/// Describes the progress of a mining operation.
+struct WorkingProgress
+{
+	uint64_t hashes = 0;		///< Total number of hashes computed.
+	uint64_t ms = 0;			///< Total number of milliseconds of mining thus far.
+	uint64_t rate() const { return ms == 0 ? 0 : hashes * 1000 / ms; }
+};
+
 inline std::ostream& operator<<(std::ostream& _out, WorkingProgress _p)
 {
 	float mh = _p.rate() / 1000000.0f;