Cleanup comments and unused functions

crackcomm · crackcomm · commit 06814a1f01f1 · 2018-11-14T01:51:53.000+01:00
diff --git a/src/miner/internal/hash-rate-counter.cpp b/src/miner/internal/hash-rate-counter.cpp
@@ -7,9 +7,6 @@
 #include "utiltime.h"
 
 
-HashRateCounter::HashRateCounter() : _parent(nullptr){};
-HashRateCounter::HashRateCounter(HashRateCounterRef parent) : _parent(parent){};
-
 void HashRateCounter::Increment(int64_t amount)
 {
     // Set start time if not set and return
diff --git a/src/miner/internal/hash-rate-counter.h b/src/miner/internal/hash-rate-counter.h
@@ -24,15 +24,12 @@ struct HashRateCounter : public std::enable_shared_from_this<HashRateCounter> {
     HashRateCounterRef _parent;
 
 public:
-    HashRateCounter();
-    explicit HashRateCounter(HashRateCounterRef counter);
+    explicit HashRateCounter() : _parent(nullptr){};
+    explicit HashRateCounter(HashRateCounterRef parent) : _parent(parent){};
 
     // Returns hash rate per second
     operator int64_t() { return _count_per_sec; };
 
-    // Creates new counter
-    static HashRateCounterRef Make() { return std::make_shared<HashRateCounter>(); }
-
     // Creates new child counter
     HashRateCounterRef MakeChild() { return std::make_shared<HashRateCounter>(shared_from_this()); }
 
diff --git a/src/miner/internal/miner-context.cpp b/src/miner/internal/miner-context.cpp
@@ -6,6 +6,13 @@
 #include "miner/miner-util.h"
 #include "validation.h"
 
+MinerContext::MinerContext(const CChainParams& chainparams_, CConnman& connman_)
+    : counter(std::make_shared<HashRateCounter>()),
+      shared(std::make_shared<MinerSharedContext>(chainparams_, connman_)){};
+
+MinerContext::MinerContext(MinerSharedContextRef shared_, HashRateCounterRef counter_)
+    : counter(counter_), shared(shared_){};
+
 void MinerSharedContext::RecreateBlock()
 {
     // First we increment flag
diff --git a/src/miner/internal/miner-context.h b/src/miner/internal/miner-context.h
@@ -79,11 +79,8 @@ class MinerContext
     HashRateCounterRef counter;
     MinerSharedContextRef shared;
 
-    MinerContext(const CChainParams& chainparams_, CConnman& connman_)
-        : counter(HashRateCounter::Make()), shared(std::make_shared<MinerSharedContext>(chainparams_, connman_)){};
-
-    MinerContext(MinerSharedContextRef shared_, HashRateCounterRef counter_)
-        : counter(counter_), shared(shared_){};
+    MinerContext(const CChainParams& chainparams_, CConnman& connman_);
+    MinerContext(MinerSharedContextRef shared_, HashRateCounterRef counter_);
 
     // Constructs child context
     explicit MinerContext(const MinerContext* ctx_)
diff --git a/src/miner/internal/miners-controller.h b/src/miner/internal/miners-controller.h
@@ -42,24 +42,24 @@ class MinersController
     int64_t _last_sync_time = 0;
 
 public:
-    MinersController(MinerContextRef ctx);
     MinersController(const CChainParams& chainparams, CConnman& connman);
+    MinersController(MinerContextRef ctx);
     virtual ~MinersController() = default;
 
-    /** Starts miners */
+    // Starts miners
     void Start();
 
-    /** Shuts down all miner threads */
+    // Shuts down all miner threads
     void Shutdown();
 
-    /** Gets combined hash rate of GPU and CPU */
+    // Gets combined hash rate of GPU and CPU
     int64_t GetHashRate() const;
 
-    /** Returns CPU miners thread group */
+    // Returns CPU miners thread group
     MinersThreadGroup<CPUMiner>& group_cpu() { return _group_cpu; }
 
 #ifdef ENABLE_GPU
-    /** Returns GPU miners thread group */
+    // Returns GPU miners thread group
     MinersThreadGroup<GPUMiner>& group_gpu()
     {
         return _group_gpu;
@@ -69,23 +69,23 @@ class MinersController
 private:
     void StartIfEnabled();
 
-    /** Returns true if can start */
+    // Returns true if can start
     bool can_start() const { return _connected && _downloaded && _enable_start && _ctx->shared->has_block(); }
 
 protected:
-    /** Returns shared miner context */
+    // Returns shared miner context
     MinerContextRef ctx() const { return _ctx; }
 
-    /** Handles new node connection */
+    // Handles new node connection
     virtual void NotifyNode(const CNode* node);
 
-    /** Handles updated blockchain tip */
+    // Handles updated blockchain tip
     virtual void NotifyBlock(const CBlockIndex* pindexNew, const CBlockIndex* pindexFork, bool fInitialDownload);
 
-    /** Handles new transaction */
+    // Handles new transaction
     virtual void NotifyTransaction(const CTransaction& tx, const CBlockIndex* pindex, int posInBlock);
 
-    /** Connects signals to controller */
+    // Connects signals to controller
     friend void ConnectMinerSignals(MinersController*);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -7,9 +7,6 @@`
`7`	`7`	`#include "utiltime.h"`
`8`	`8`
`9`	`9`
`10`		`-HashRateCounter::HashRateCounter() : _parent(nullptr){};`
`11`		`-HashRateCounter::HashRateCounter(HashRateCounterRef parent) : _parent(parent){};`
`12`		`-`
`13`	`10`	`void HashRateCounter::Increment(int64_t amount)`
`14`	`11`	`{`
`15`	`12`	`// Set start time if not set and return`