Merge test_random.h into test_bitcoin.h

Zcash: Excludes changes to files we don't have, and removes the
duplicate definitions in `src/gtest/utils.h`.

(cherry picked from commit bitcoin/bitcoin@124d13a58c)

src/Makefile.test.include

@@ -110,7 +110,6 @@ BITCOIN_TESTS =\
   test/skiplist_tests.cpp \
   test/streams_tests.cpp \
   test/sync_tests.cpp \
-  test/test_random.h \
   test/test_util.cpp \
   test/test_util.h \
   test/torcontrol_tests.cpp \

src/gtest/utils.h

@@ -11,22 +11,4 @@ void LoadProofParameters();
 void LoadGlobalWallet();
 void UnloadGlobalWallet();
 
-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();
-}
-
 #endif

src/test/coins_tests.cpp

@@ -4,7 +4,6 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "coins.h"
-#include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
 #include "util/strencodings.h"

src/test/crypto_tests.cpp

@@ -11,7 +11,6 @@
 #include "crypto/sha512.h"
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
-#include "test_random.h"
 #include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 

src/test/merkle_tests.cpp

@@ -4,7 +4,6 @@
 
 #include "consensus/merkle.h"
 #include "test/test_bitcoin.h"
-#include "test_random.h"
 
 #include <boost/test/unit_test.hpp>
 

src/test/pmt_tests.cpp

@@ -10,7 +10,6 @@
 #include "uint256.h"
 #include "arith_uint256.h"
 #include "version.h"
-#include "test_random.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>

src/test/prevector_tests.cpp

@@ -5,7 +5,6 @@
 
 #include <vector>
 #include "prevector.h"
-#include "test_random.h"
 
 #include "reverse_iterator.h"
 #include "serialize.h"

src/test/sighash_tests.cpp

@@ -7,7 +7,6 @@
 #include "consensus/validation.h"
 #include "test/data/sighash.json.h"
 #include "main.h"
-#include "test_random.h"
 #include "script/interpreter.h"
 #include "script/script.h"
 #include "serialize.h"

src/test/skiplist_tests.cpp

@@ -4,7 +4,6 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "main.h"
-#include "test_random.h"
 #include "util/system.h"
 #include "test/test_bitcoin.h"
 

src/test/streams_tests.cpp

@@ -5,7 +5,6 @@
 #include "fs.h"
 #include "main.h"
 #include "test/test_bitcoin.h"
-#include "test/test_random.h"
 
 #include <boost/test/unit_test.hpp>
 

src/test/test_bitcoin.h

@@ -6,10 +6,29 @@
 #include "fs.h"
 #include "key.h"
 #include "pubkey.h"
+#include "random.h"
 #include "txdb.h"
 
 #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();
+}
+
 /** Basic testing setup.
  * This just configures logging and chain parameters.
  */

src/test/test_random.h

@@ -1,30 +0,0 @@
-// Copyright (c) 2009-2010 Satoshi Nakamoto
-// Copyright (c) 2009-2014 The Bitcoin Core developers
-// Copyright (c) 2020-2022 The Zcash developers
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or https://www.opensource.org/licenses/mit-license.php .
-
-#ifndef BITCOIN_TEST_TEST_RANDOM_H
-#define BITCOIN_TEST_TEST_RANDOM_H
-
-#include "random.h"
-
-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();
-}
-
-#endif

src/test/util_tests.cpp

@@ -7,7 +7,6 @@
 
 #include "clientversion.h"
 #include "primitives/transaction.h"
-#include "test_random.h"
 #include "sync.h"
 #include "util/strencodings.h"
 #include "util/moneystr.h"

src/wallet/test/crypto_tests.cpp

@@ -3,9 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "test/test_random.h"
-#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
+#include "util/strencodings.h"
 #include "wallet/crypter.h"
 
 #include <vector>