From 71b6a59ec3f6ad41aba3ec1f5dc4bb421e832ec5 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Wed, 6 Jul 2022 10:25:28 -0600 Subject: [PATCH] scripted-diff: Move utiltest to src/util -BEGIN VERIFY SCRIPT- git mv src/utiltest.h src/util/test.h git mv src/utiltest.cpp src/util/test.cpp sed -i -e 's/"utiltest\.h"/"util\/test\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp') sed -i -e 's/ZCASH_UTILTEST_H/ZCASH_UTIL_TEST_H/g' src/util/test.h sed -i -e 's/utiltest\.\(h\|cpp\)/util\/test\.\1/g' src/Makefile.am -END VERIFY SCRIPT- --- src/Makefile.am | 4 ++-- src/gtest/main.cpp | 2 +- src/gtest/test_checkblock.cpp | 2 +- src/gtest/test_checktransaction.cpp | 2 +- src/gtest/test_dynamicusage.cpp | 2 +- src/gtest/test_feature_flagging.cpp | 2 +- src/gtest/test_foundersreward.cpp | 2 +- src/gtest/test_history.cpp | 2 +- src/gtest/test_joinsplit.cpp | 2 +- src/gtest/test_keys.cpp | 2 +- src/gtest/test_keystore.cpp | 2 +- src/gtest/test_mempoollimit.cpp | 2 +- src/gtest/test_metrics.cpp | 2 +- src/gtest/test_noteencryption.cpp | 2 +- src/gtest/test_pow.cpp | 2 +- src/gtest/test_transaction_builder.cpp | 2 +- src/gtest/test_validation.cpp | 2 +- src/test/alert_tests.cpp | 2 +- src/test/key_tests.cpp | 2 +- src/test/pow_tests.cpp | 2 +- src/test/transaction_tests.cpp | 2 +- src/{utiltest.cpp => util/test.cpp} | 2 +- src/{utiltest.h => util/test.h} | 6 +++--- src/wallet/gtest/test_orchard_wallet.cpp | 2 +- src/wallet/gtest/test_rpc_wallet.cpp | 2 +- src/wallet/gtest/test_wallet.cpp | 2 +- src/wallet/test/rpc_wallet_tests.cpp | 2 +- src/zcbenchmarks.cpp | 2 +- 28 files changed, 31 insertions(+), 31 deletions(-) rename src/{utiltest.cpp => util/test.cpp} (99%) rename src/{utiltest.h => util/test.h} (97%) diff --git a/src/Makefile.am b/src/Makefile.am index f6d436e74..a2cce9212 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -287,7 +287,7 @@ BITCOIN_CORE_H = \ util/match.h \ util/moneystr.h \ util/strencodings.h \ - utiltest.h \ + util/test.h \ util/time.h \ validationinterface.h \ version.h \ @@ -468,7 +468,7 @@ libbitcoin_common_a_SOURCES = \ script/sign.cpp \ script/standard.cpp \ transaction_builder.cpp \ - utiltest.cpp \ + util/test.cpp \ warnings.cpp \ $(BITCOIN_CORE_H) \ $(LIBZCASH_H) diff --git a/src/gtest/main.cpp b/src/gtest/main.cpp index c4d3eaaeb..1c53074ef 100644 --- a/src/gtest/main.cpp +++ b/src/gtest/main.cpp @@ -4,7 +4,7 @@ #include "pubkey.h" #include "random.h" #include "util/system.h" -#include "utiltest.h" +#include "util/test.h" #include "librustzcash.h" #include diff --git a/src/gtest/test_checkblock.cpp b/src/gtest/test_checkblock.cpp index 5c702a305..1d660e03f 100644 --- a/src/gtest/test_checkblock.cpp +++ b/src/gtest/test_checkblock.cpp @@ -4,7 +4,7 @@ #include "consensus/validation.h" #include "main.h" #include "proof_verifier.h" -#include "utiltest.h" +#include "util/test.h" #include "zcash/Proof.hpp" class MockCValidationState : public CValidationState { diff --git a/src/gtest/test_checktransaction.cpp b/src/gtest/test_checktransaction.cpp index f25bd30b9..3d98d11b6 100644 --- a/src/gtest/test_checktransaction.cpp +++ b/src/gtest/test_checktransaction.cpp @@ -6,7 +6,7 @@ #include "consensus/validation.h" #include "transaction_builder.h" #include "gtest/utils.h" -#include "utiltest.h" +#include "util/test.h" #include "zcash/JoinSplit.hpp" #include diff --git a/src/gtest/test_dynamicusage.cpp b/src/gtest/test_dynamicusage.cpp index 30dd82955..0354e911b 100644 --- a/src/gtest/test_dynamicusage.cpp +++ b/src/gtest/test_dynamicusage.cpp @@ -10,7 +10,7 @@ #include "key.h" #include "transaction_builder.h" #include "gtest/utils.h" -#include "utiltest.h" +#include "util/test.h" #include diff --git a/src/gtest/test_feature_flagging.cpp b/src/gtest/test_feature_flagging.cpp index b23c38b7b..f8afdf0a9 100644 --- a/src/gtest/test_feature_flagging.cpp +++ b/src/gtest/test_feature_flagging.cpp @@ -2,7 +2,7 @@ #include "chainparams.h" #include "consensus/params.h" -#include "utiltest.h" +#include "util/test.h" #include diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp index 728b52bf9..d75e1bc9c 100644 --- a/src/gtest/test_foundersreward.cpp +++ b/src/gtest/test_foundersreward.cpp @@ -15,7 +15,7 @@ #include #include #include "util/system.h" -#include "utiltest.h" +#include "util/test.h" // To run tests: // ./zcash-gtest --gtest_filter="FoundersRewardTest.*" diff --git a/src/gtest/test_history.cpp b/src/gtest/test_history.cpp index 28ad5be15..2f00cfa5d 100644 --- a/src/gtest/test_history.cpp +++ b/src/gtest/test_history.cpp @@ -1,7 +1,7 @@ #include #include "main.h" -#include "utiltest.h" +#include "util/test.h" #include "zcash/History.hpp" // Fake an empty view diff --git a/src/gtest/test_joinsplit.cpp b/src/gtest/test_joinsplit.cpp index 984380fde..2b7011d2f 100644 --- a/src/gtest/test_joinsplit.cpp +++ b/src/gtest/test_joinsplit.cpp @@ -12,7 +12,7 @@ #include "proof_verifier.h" #include "transaction_builder.h" #include "gtest/utils.h" -#include "utiltest.h" +#include "util/test.h" #include "zcash/JoinSplit.hpp" #include "zcash/Note.hpp" #include "zcash/NoteEncryption.hpp" diff --git a/src/gtest/test_keys.cpp b/src/gtest/test_keys.cpp index 6c247ef7f..0482e5fa5 100644 --- a/src/gtest/test_keys.cpp +++ b/src/gtest/test_keys.cpp @@ -2,7 +2,7 @@ #include #include -#include "utiltest.h" +#include "util/test.h" #include diff --git a/src/gtest/test_keystore.cpp b/src/gtest/test_keystore.cpp index 64e3ea97d..4d9cfbee3 100644 --- a/src/gtest/test_keystore.cpp +++ b/src/gtest/test_keystore.cpp @@ -7,7 +7,7 @@ #ifdef ENABLE_WALLET #include "wallet/crypter.h" #endif -#include "utiltest.h" +#include "util/test.h" #include "zcash/Address.hpp" #include "json_test_vectors.h" diff --git a/src/gtest/test_mempoollimit.cpp b/src/gtest/test_mempoollimit.cpp index a2d5ecd35..9d0f4ff7e 100644 --- a/src/gtest/test_mempoollimit.cpp +++ b/src/gtest/test_mempoollimit.cpp @@ -9,7 +9,7 @@ #include "mempool_limit.h" #include "gtest/utils.h" #include "util/time.h" -#include "utiltest.h" +#include "util/test.h" #include "transaction_builder.h" diff --git a/src/gtest/test_metrics.cpp b/src/gtest/test_metrics.cpp index 4021665fa..272add00c 100644 --- a/src/gtest/test_metrics.cpp +++ b/src/gtest/test_metrics.cpp @@ -1,7 +1,7 @@ #include #include "metrics.h" -#include "utiltest.h" +#include "util/test.h" #include "util/time.h" diff --git a/src/gtest/test_noteencryption.cpp b/src/gtest/test_noteencryption.cpp index 640dd64d6..dd8b37f7e 100644 --- a/src/gtest/test_noteencryption.cpp +++ b/src/gtest/test_noteencryption.cpp @@ -12,7 +12,7 @@ #include "crypto/sha256.h" #include "librustzcash.h" #include "consensus/params.h" -#include "utiltest.h" +#include "util/test.h" class TestNoteDecryption : public ZCNoteDecryption { public: diff --git a/src/gtest/test_pow.cpp b/src/gtest/test_pow.cpp index 7ee1bf3e4..7533df513 100644 --- a/src/gtest/test_pow.cpp +++ b/src/gtest/test_pow.cpp @@ -4,7 +4,7 @@ #include "chainparams.h" #include "pow.h" #include "random.h" -#include "utiltest.h" +#include "util/test.h" void TestDifficultyAveragingImpl(const Consensus::Params& params) { diff --git a/src/gtest/test_transaction_builder.cpp b/src/gtest/test_transaction_builder.cpp index fe0faa4bb..192bed58c 100644 --- a/src/gtest/test_transaction_builder.cpp +++ b/src/gtest/test_transaction_builder.cpp @@ -9,7 +9,7 @@ #include "transaction_builder.h" #include "gtest/test_transaction_builder.h" #include "gtest/utils.h" -#include "utiltest.h" +#include "util/test.h" #include "zcash/Address.hpp" #include "zcash/address/mnemonic.h" diff --git a/src/gtest/test_validation.cpp b/src/gtest/test_validation.cpp index d10d9c82f..ec56c5072 100644 --- a/src/gtest/test_validation.cpp +++ b/src/gtest/test_validation.cpp @@ -5,7 +5,7 @@ #include "consensus/validation.h" #include "main.h" #include "transaction_builder.h" -#include "utiltest.h" +#include "util/test.h" #include diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index 10d44e65d..5c78be3a6 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -19,7 +19,7 @@ #include "serialize.h" #include "streams.h" #include "util/strencodings.h" -#include "utiltest.h" +#include "util/test.h" #include "warnings.h" #include "test/test_bitcoin.h" diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 4f11bcb53..5100e4980 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -11,7 +11,7 @@ #include "uint256.h" #include "util/system.h" #include "util/strencodings.h" -#include "utiltest.h" +#include "util/test.h" #include "test/test_bitcoin.h" #include "zcash/Address.hpp" diff --git a/src/test/pow_tests.cpp b/src/test/pow_tests.cpp index b1fcdb851..7feb42103 100644 --- a/src/test/pow_tests.cpp +++ b/src/test/pow_tests.cpp @@ -6,7 +6,7 @@ #include "main.h" #include "pow.h" #include "util/system.h" -#include "utiltest.h" +#include "util/test.h" #include "test/test_bitcoin.h" #include diff --git a/src/test/transaction_tests.cpp b/src/test/transaction_tests.cpp index d56e952fe..6f5c5d033 100644 --- a/src/test/transaction_tests.cpp +++ b/src/test/transaction_tests.cpp @@ -25,7 +25,7 @@ #include "test/test_util.h" #include "primitives/transaction.h" #include "transaction_builder.h" -#include "utiltest.h" +#include "util/test.h" #include #include diff --git a/src/utiltest.cpp b/src/util/test.cpp similarity index 99% rename from src/utiltest.cpp rename to src/util/test.cpp index 114e91856..2e1dc9d65 100644 --- a/src/utiltest.cpp +++ b/src/util/test.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . -#include "utiltest.h" +#include "util/test.h" #include "consensus/upgrades.h" #include "transaction_builder.h" diff --git a/src/utiltest.h b/src/util/test.h similarity index 97% rename from src/utiltest.h rename to src/util/test.h index 2c7ab4c62..cb5fc47f8 100644 --- a/src/utiltest.h +++ b/src/util/test.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php . -#ifndef ZCASH_UTILTEST_H -#define ZCASH_UTILTEST_H +#ifndef ZCASH_UTIL_TEST_H +#define ZCASH_UTIL_TEST_H #include "coins.h" #include "key_io.h" @@ -100,4 +100,4 @@ CWalletTx GetValidSaplingReceive(const Consensus::Params& consensusParams, const libzcash::SaplingExtendedSpendingKey &sk, CAmount value); -#endif // ZCASH_UTILTEST_H +#endif // ZCASH_UTIL_TEST_H diff --git a/src/wallet/gtest/test_orchard_wallet.cpp b/src/wallet/gtest/test_orchard_wallet.cpp index c07a43ec1..958ca4af5 100644 --- a/src/wallet/gtest/test_orchard_wallet.cpp +++ b/src/wallet/gtest/test_orchard_wallet.cpp @@ -4,7 +4,7 @@ #include "consensus/validation.h" #include "random.h" #include "transaction_builder.h" -#include "utiltest.h" +#include "util/test.h" #include "wallet/orchard.h" #include "zcash/Address.hpp" diff --git a/src/wallet/gtest/test_rpc_wallet.cpp b/src/wallet/gtest/test_rpc_wallet.cpp index bcd16529e..090a92ec7 100644 --- a/src/wallet/gtest/test_rpc_wallet.cpp +++ b/src/wallet/gtest/test_rpc_wallet.cpp @@ -5,7 +5,7 @@ #include "primitives/transaction.h" #include "consensus/validation.h" #include "transaction_builder.h" -#include "utiltest.h" +#include "util/test.h" #include "gtest/utils.h" #include "wallet/asyncrpcoperation_mergetoaddress.h" #include "wallet/asyncrpcoperation_shieldcoinbase.h" diff --git a/src/wallet/gtest/test_wallet.cpp b/src/wallet/gtest/test_wallet.cpp index 857345ee7..ba98c1934 100644 --- a/src/wallet/gtest/test_wallet.cpp +++ b/src/wallet/gtest/test_wallet.cpp @@ -10,7 +10,7 @@ #include "random.h" #include "transaction_builder.h" #include "gtest/utils.h" -#include "utiltest.h" +#include "util/test.h" #include "wallet/wallet.h" #include "zcash/JoinSplit.hpp" #include "zcash/Note.hpp" diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp index 2f7c2f69d..43d449602 100644 --- a/src/wallet/test/rpc_wallet_tests.cpp +++ b/src/wallet/test/rpc_wallet_tests.cpp @@ -21,7 +21,7 @@ #include "wallet/asyncrpcoperation_shieldcoinbase.h" #include "init.h" -#include "utiltest.h" +#include "util/test.h" #include "test/test_bitcoin.h" #include "test/test_util.h" diff --git a/src/zcbenchmarks.cpp b/src/zcbenchmarks.cpp index e9f6ef88c..2bf962d55 100644 --- a/src/zcbenchmarks.cpp +++ b/src/zcbenchmarks.cpp @@ -25,7 +25,7 @@ #include "streams.h" #include "transaction_builder.h" #include "txdb.h" -#include "utiltest.h" +#include "util/test.h" #include "wallet/wallet.h" #include "zcbenchmarks.h"