Fixed merge errors

2020-09-23 00:50:15 +00:00 · 2020-09-23 00:50:15 +00:00 · c715fc618c
commit c715fc618c
parent 21b156cbda
2 changed files with 8 additions and 4 deletions
--- a/src/crypto/randomx/randomx.cpp
+++ b/src/crypto/randomx/randomx.cpp
@ -139,7 +139,10 @@ RandomX_ConfigurationScala2::RandomX_ConfigurationScala2()
 }

 RandomX_ConfigurationBase::RandomX_ConfigurationBase()
-	: ArgonIterations(3)
+	: ArgonMemory = 262144
+        , CacheAccesses = 8
+        , DatasetBaseSize = 2147483648
+        , ArgonIterations(3)
 	, ArgonLanes(1)
 	, ArgonSalt("RandomX\x03")
 	, ScratchpadL1_Size(16384)