Merge of xmrig v6.5.0

src/base/net/stratum/Pools.cpp

@@ -32,6 +32,11 @@
 #include "donate.h"
 
 
+#ifdef XMRIG_FEATURE_BENCHMARK
+#   include "base/net/stratum/benchmark/BenchConfig.h"
+#endif
+
+
 namespace xmrig {
 
 
@@ -118,6 +123,15 @@ void xmrig::Pools::load(const IJsonReader &reader)
 {
     m_data.clear();
 
+#   ifdef XMRIG_FEATURE_BENCHMARK
+    m_benchmark = std::shared_ptr<BenchConfig>(BenchConfig::create(reader.getObject(BenchConfig::kBenchmark)));
+    if (m_benchmark) {
+        m_data.emplace_back(m_benchmark);
+
+        return;
+    }
+#   endif
+
     const rapidjson::Value &pools = reader.getArray(kPools);
     if (!pools.IsArray()) {
         return;
@@ -147,12 +161,10 @@ void xmrig::Pools::load(const IJsonReader &reader)
 uint32_t xmrig::Pools::benchSize() const
 {
 #   ifdef XMRIG_FEATURE_BENCHMARK
-    if (m_data.size() == 1 && m_data.front().mode() == Pool::MODE_BENCHMARK) {
-        return m_data.front().benchSize();
-    }
-#   endif
-
+    return m_benchmark ? m_benchmark->size() : 0;
+#   else
     return 0;
+#   endif    
 }