Refactoring

src/net/JobResult.h

@@ -41,43 +41,31 @@ namespace xmrig {
 class JobResult
 {
 public:
-    inline JobResult() : poolId(0), nonce(0), diff(0) {}
-    inline JobResult(int poolId, const String &jobId, const String &clientId, uint32_t nonce, const uint8_t *result, uint64_t diff, const Algorithm &algorithm) :
-        algorithm(algorithm),
-        poolId(poolId),
-        clientId(clientId),
-        jobId(jobId),
+    inline JobResult() {}
+
+    inline JobResult(const Job &job, uint32_t nonce, const uint8_t *result) :
+        algorithm(job.algorithm()),
+        clientId(job.clientId()),
+        jobId(job.id()),
         nonce(nonce),
-        diff(diff)
+        diff(job.diff()),
+        index(job.index())
     {
-        memcpy(this->result, result, sizeof(this->result));
+        memcpy(m_result, result, sizeof(m_result));
     }
 
+    inline const uint8_t *result() const    { return m_result; }
+    inline uint64_t actualDiff() const      { return Job::toDiff(reinterpret_cast<const uint64_t*>(m_result)[3]); }
 
-    inline JobResult(const Job &job) : poolId(0), nonce(0), diff(0)
-    {
-        jobId     = job.id();
-        clientId  = job.clientId();
-        poolId    = job.poolId();
-        diff      = job.diff();
-        nonce     = *job.nonce();
-        algorithm = job.algorithm();
-    }
+    const Algorithm algorithm;
+    const String clientId;
+    const String jobId;
+    const uint32_t nonce    = 0;
+    const uint64_t diff     = 0;
+    const uint8_t index     = 0;
 
-
-    inline uint64_t actualDiff() const
-    {
-        return Job::toDiff(reinterpret_cast<const uint64_t*>(result)[3]);
-    }
-
-
-    Algorithm algorithm;
-    int poolId;
-    String clientId;
-    String jobId;
-    uint32_t nonce;
-    uint64_t diff;
-    uint8_t result[32];
+private:
+    uint8_t m_result[32];
 };
 
 

src/net/Network.cpp

@@ -144,7 +144,7 @@ void xmrig::Network::onJob(IStrategy *strategy, IClient *client, const Job &job)
 
 void xmrig::Network::onJobResult(const JobResult &result)
 {
-    if (result.poolId == -1 && m_donate) {
+    if (result.index == 1 && m_donate) {
         m_donate->submit(result);
         return;
     }