Cleanup MoneroOcean patchset

src/backend/cpu/CpuConfig_gen.h

@@ -138,8 +138,8 @@ size_t inline generate<Algorithm::RANDOM_X>(Threads<CpuThreads> &threads, uint32
         count += threads.move("rx/wow", std::move(wow));
     }
 
-    if (!threads.isExist(Algorithm::DEFYX)) {
-        count += generate("defyx", threads, Algorithm::DEFYX, limit);
+    if (!threads.isExist(Algorithm::RX_DEFYX)) {
+        count += generate("defyx", threads, Algorithm::RX_DEFYX, limit);
     }
 
     count += generate("rx", threads, Algorithm::RX_0, limit);

src/backend/cpu/CpuWorker.cpp

@@ -42,7 +42,6 @@
 
 #ifdef XMRIG_ALGO_RANDOMX
 #   include "crypto/randomx/randomx.h"
-#   include "crypto/defyx/defyx.h"
 #endif
 
 
@@ -253,29 +252,24 @@ void xmrig::CpuWorker<N>::start()
 #           ifdef XMRIG_ALGO_RANDOMX
             if (job.algorithm().family() == Algorithm::RANDOM_X) {
 
-              if (job.algorithm() == Algorithm::DEFYX) {
                 if (first) {
                     first = false;
-                    defyx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
+                    if (job.algorithm() == Algorithm::RX_DEFYX) {
+                        defyx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
+                    } else {
+                        randomx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
+                    }
                 }
 
                 if (!nextRound(m_job)) {
                     break;
                 }
 
-                defyx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
-              } else {
-                if (first) {
-                    first = false;
-                    randomx_calculate_hash_first(m_vm, tempHash, m_job.blob(), job.size());
+                if (job.algorithm() == Algorithm::RX_DEFYX) {
+                    defyx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
+                } else {
+                    randomx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
                 }
-
-                if (!nextRound(m_job)) {
-                    break;
-                }
-
-                randomx_calculate_hash_next(m_vm, tempHash, m_job.blob(), job.size(), m_hash);
-              }
             }
             else
 #           endif

src/backend/opencl/cl/cn/algorithm.cl

@@ -24,10 +24,11 @@
 #define ALGO_RX_ARQMA       23
 #define ALGO_RX_SFX         24
 #define ALGO_RX_KEVA        25
-#define ALGO_AR2_CHUKWA     26
-#define ALGO_AR2_WRKZ       27
-#define ALGO_ASTROBWT_DERO  28
-#define ALGO_KAWPOW_RVN     29
+#define ALGO_RX_DEFYX       26
+#define ALGO_AR2_CHUKWA     27
+#define ALGO_AR2_WRKZ       28
+#define ALGO_ASTROBWT_DERO  29
+#define ALGO_KAWPOW_RVN     30
 
 #define FAMILY_UNKNOWN      0
 #define FAMILY_CN           1