Merge test_random.h into test_bitcoin.h

sipa · Warrows · commit 4a811ff95424 · 2019-07-31T11:52:15.000+02:00
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -68,7 +68,6 @@ BITCOIN_TESTS =\
   test/sighash_tests.cpp \
   test/sigopcount_tests.cpp \
   test/skiplist_tests.cpp \
-  test/test_random.h \
   test/timedata_tests.cpp \
   test/torcontrol_tests.cpp \
   test/transaction_tests.cpp \
diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp
@@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "coins.h"
-#include "test_random.h"
 #include "uint256.h"
 #include "test/test_pivx.h"
 
diff --git a/src/test/crypto_tests.cpp b/src/test/crypto_tests.cpp
@@ -10,7 +10,6 @@
 #include "crypto/sha512.h"
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
-#include "test_random.h"
 #include "random.h"
 #include "utilstrencodings.h"
 #include "test/test_pivx.h"
diff --git a/src/test/pmt_tests.cpp b/src/test/pmt_tests.cpp
@@ -9,7 +9,6 @@
 #include "uint256.h"
 #include "version.h"
 #include "test/test_pivx.h"
-#include "test_random.h"
 
 #include <vector>
 
diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp
@@ -5,7 +5,6 @@
 
 #include "data/sighash.json.h"
 #include "main.h"
-#include "test_random.h"
 #include "serialize.h"
 #include "script/script.h"
 #include "script/interpreter.h"
diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp
@@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "main.h"
-#include "test_random.h"
 #include "util.h"
 #include "test/test_pivx.h"
 
diff --git a/src/test/test_pivx.h b/src/test/test_pivx.h
@@ -10,6 +10,24 @@
 #include <boost/filesystem.hpp>
 #include <boost/thread.hpp>
 
+extern uint256 insecure_rand_seed;
+extern FastRandomContext insecure_rand_ctx;
+
+static inline void seed_insecure_rand(bool fDeterministic = false)
+{
+    if (fDeterministic) {
+        insecure_rand_seed = uint256();
+    } else {
+        insecure_rand_seed = GetRandHash();
+    }
+    insecure_rand_ctx = FastRandomContext(insecure_rand_seed);
+}
+
+static inline uint32_t insecure_rand(void)
+{
+    return insecure_rand_ctx.rand32();
+}
+
 static inline uint32_t insecure_rand() { return insecure_rand_ctx.rand32(); }
 static inline uint256 insecure_rand256() { return insecure_rand_ctx.rand256(); }
 static inline uint64_t insecure_randbits(int bits) { return insecure_rand_ctx.randbits(bits); }
diff --git a/src/test/test_random.h b/src/test/test_random.h
diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp
@@ -7,7 +7,6 @@
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
-#include "test_random.h"
 #include "sync.h"
 #include "utilstrencodings.h"
 #include "utilmoneystr.h"
