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-
This commit is contained in:
parent
9a7e2c153d
commit
71b6a59ec3
|
@ -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)
|
||||
|
|
|
@ -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 <sodium.h>
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -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 <librustzcash.h>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#include "key.h"
|
||||
#include "transaction_builder.h"
|
||||
#include "gtest/utils.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
|
||||
#include <optional>
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include "chainparams.h"
|
||||
#include "consensus/params.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
|
||||
#include <optional>
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
#include <set>
|
||||
#include <vector>
|
||||
#include "util/system.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
|
||||
// To run tests:
|
||||
// ./zcash-gtest --gtest_filter="FoundersRewardTest.*"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <gtest/gtest.h>
|
||||
|
||||
#include "main.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
#include "zcash/History.hpp"
|
||||
|
||||
// Fake an empty view
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#include <key_io.h>
|
||||
#include <zcash/Address.hpp>
|
||||
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
|
||||
#include <variant>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include <gtest/gtest.h>
|
||||
|
||||
#include "metrics.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
#include "util/time.h"
|
||||
|
||||
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
#include "consensus/validation.h"
|
||||
#include "main.h"
|
||||
#include "transaction_builder.h"
|
||||
#include "utiltest.h"
|
||||
#include "util/test.h"
|
||||
|
||||
#include <optional>
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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 <boost/test/unit_test.hpp>
|
||||
|
|
|
@ -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 <array>
|
||||
#include <map>
|
||||
|
|
|
@ -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"
|
|
@ -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
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue