scripted-diff: Move util files to separate directory.

-BEGIN VERIFY SCRIPT-
mkdir -p src/util
git mv src/util.h src/util/system.h
git mv src/util.cpp src/util/system.cpp
git mv src/utilmoneystr.h src/util/moneystr.h
git mv src/utilmoneystr.cpp src/util/moneystr.cpp
git mv src/utilstrencodings.h src/util/strencodings.h
git mv src/utilstrencodings.cpp src/util/strencodings.cpp
git mv src/utiltime.h src/util/time.h
git mv src/utiltime.cpp src/util/time.cpp

sed -i -e 's/"util\.h"/"util\/system\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
git checkout HEAD -- src/secp256k1 # exclude secp256k1, which has its own "util.h"
sed -i -e 's/"utilmoneystr\.h"/"util\/moneystr\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utilstrencodings\.h"/"util\/strencodings\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/<utilstrencodings\.h>/<util\/strencodings\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp')
sed -i -e 's/"utiltime\.h"/"util\/time\.h"/g' $(git ls-files 'src/*.h' 'src/*.cpp')

sed -i -e 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h
sed -i -e 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h
sed -i -e 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h
sed -i -e 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h

sed -i -e 's/ util\.\(h\|cpp\)/ util\/system\.\1/g' src/Makefile.am
sed -i -e 's/utilmoneystr\.\(h\|cpp\)/util\/moneystr\.\1/g' src/Makefile.am
sed -i -e 's/utilstrencodings\.\(h\|cpp\)/util\/strencodings\.\1/g' src/Makefile.am
sed -i -e 's/utiltime\.\(h\|cpp\)/util\/time\.\1/g' src/Makefile.am

sed -i -e 's/src\/util\.cpp/src\/util\/system\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilmoneystr\.cpp/src\/util\/moneystr\.cpp/g' test/lint/lint-locale-dependence.sh
sed -i -e 's/src\/utilstrencodings\.\(h\|cpp\)/src\/util\/strencodings\.\1/g' test/lint/lint-locale-dependence.sh
-END VERIFY SCRIPT-

src/Makefile.am

@@ -283,12 +283,12 @@ BITCOIN_CORE_H = \
   uint256.h \
   uint252.h \
   undo.h \
-  util.h \
+  util/system.h \
   util/match.h \
-  utilmoneystr.h \
-  utilstrencodings.h \
+  util/moneystr.h \
+  util/strencodings.h \
   utiltest.h \
-  utiltime.h \
+  util/time.h \
   validationinterface.h \
   version.h \
   wallet/asyncrpcoperation_common.h \
@@ -492,10 +492,10 @@ libbitcoin_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   uint256.cpp \
-  util.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
+  util/system.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
   $(BITCOIN_CORE_H) \
   $(LIBZCASH_H)
 
@@ -635,7 +635,7 @@ libzcash_script_la_SOURCES = \
   script/interpreter.cpp \
   script/script.cpp \
   uint256.cpp \
-  utilstrencodings.cpp
+  util/strencodings.cpp
 
 if GLIBC_BACK_COMPAT
   libzcash_script_la_SOURCES += compat/glibc_compat.cpp

src/addrdb.cpp

@@ -13,7 +13,7 @@
 #include "random.h"
 #include "streams.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/filesystem.hpp>
 

src/addrman.h

@@ -10,7 +10,7 @@
 #include "random.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <map>
 #include <set>

src/alert.cpp

@@ -11,7 +11,7 @@
 #include "pubkey.h"
 #include "timedata.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdint.h>
 #include <algorithm>

src/arith_uint256.cpp

@@ -6,7 +6,7 @@
 #include "arith_uint256.h"
 
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "crypto/common.h"
 
 #include <stdio.h>

src/asyncrpcqueue.cpp

@@ -3,7 +3,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "asyncrpcqueue.h"
-#include "util.h"
+#include "util/system.h"
 
 static std::atomic<size_t> workerCounter(0);
 

src/bench/Examples.cpp

@@ -5,7 +5,7 @@
 
 #include "bench.h"
 #include "main.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.

src/bench/bench_bitcoin.cpp

@@ -8,7 +8,7 @@
 #include "fs.h"
 #include "key.h"
 #include "main.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "librustzcash.h"
 

src/bench/checkqueue.cpp

@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "bench.h"
-#include "util.h"
+#include "util/system.h"
 #include "main.h"
 #include "checkqueue.h"
 #include "prevector.h"

src/bench/crypto_hash.cpp

@@ -8,7 +8,7 @@
 #include "bench.h"
 #include "bloom.h"
 #include "random.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "crypto/ripemd160.h"
 #include "crypto/sha1.h"
 #include "crypto/sha256.h"

src/bench/verification.cpp

@@ -11,7 +11,7 @@
 #include "script/sign.h"
 #include "streams.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include "librustzcash.h"

src/bitcoin-cli.cpp

@@ -9,8 +9,8 @@
 #include "fs.h"
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 

src/bitcoin-tx.cpp

@@ -15,9 +15,9 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 

src/bitcoind.cpp

@@ -12,7 +12,7 @@
 #include "main.h"
 #include "noui.h"
 #include "scheduler.h"
-#include "util.h"
+#include "util/system.h"
 #include "httpserver.h"
 #include "httprpc.h"
 

src/chainparams.cpp

@@ -9,8 +9,8 @@
 #include "crypto/equihash.h"
 
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <assert.h>
 #include <optional>

src/chainparamsbase.cpp

@@ -7,7 +7,7 @@
 #include "chainparamsbase.h"
 
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <assert.h>
 

src/consensus/params.cpp

@@ -8,7 +8,7 @@
 #include <key_io.h>
 #include <script/standard.h>
 #include "upgrades.h"
-#include "util.h"
+#include "util/system.h"
 #include "util/match.h"
 
 namespace Consensus {

src/core_read.cpp

@@ -11,8 +11,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include <boost/algorithm/string/classification.hpp>

src/core_write.cpp

@@ -12,9 +12,9 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <boost/assign/list_of.hpp>
 

src/crypto/equihash.cpp

@@ -18,7 +18,7 @@
 
 #include "compat/endian.h"
 #include "crypto/equihash.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <optional>
 

src/crypto/equihash.h

@@ -30,7 +30,7 @@ void EhIndexToArray(const eh_index i, unsigned char* array);
 #ifdef ENABLE_MINING
 
 #include "crypto/sha256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <cstring>
 #include <exception>

src/dbwrapper.cpp

@@ -6,7 +6,7 @@
 #include "dbwrapper.h"
 
 #include "fs.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <leveldb/cache.h>
 #include <leveldb/env.h>

src/dbwrapper.h

@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 
 #include <leveldb/db.h>

src/deprecation.cpp

@@ -8,7 +8,7 @@
 #include "clientversion.h"
 #include "init.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 #include "chainparams.h"
 
 // Flags that enable deprecated functionality.

src/experimental_features.cpp

@@ -4,7 +4,7 @@
 
 #include "experimental_features.h"
 
-#include "util.h"
+#include "util/system.h"
 
 bool fExperimentalDeveloperEncryptWallet = false;
 bool fExperimentalDeveloperSetPoolSizeZero = false;

src/gtest/json_test_vectors.h

@@ -3,7 +3,7 @@
 
 #include <gtest/gtest.h>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 #include "serialize.h"
 #include "streams.h"

src/gtest/main.cpp

@@ -3,7 +3,7 @@
 #include "key.h"
 #include "pubkey.h"
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 
 #include "librustzcash.h"

src/gtest/test_coins.cpp

@@ -7,7 +7,7 @@
 #include "gtest/utils.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 #include "consensus/validation.h"
 #include "main.h"

src/gtest/test_consensus.cpp

@@ -4,7 +4,7 @@
 #include <rust/ed25519.h>
 
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 void TestLibsodiumEd25519SignatureVerification(
     const std::string &scope,

src/gtest/test_deprecation.cpp

@@ -7,8 +7,8 @@
 #include "fs.h"
 #include "init.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <fstream>
 

src/gtest/test_equihash.cpp

@@ -7,7 +7,7 @@
 
 #include "crypto/equihash.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 void TestExpandAndCompress(const std::string &scope, size_t bit_len, size_t byte_pad,
                            std::vector<unsigned char> compact,

src/gtest/test_foundersreward.cpp

@@ -1,12 +1,12 @@
 #include <gtest/gtest.h>
 
 #include "main.h"
-#include "utilmoneystr.h"
+#include "util/moneystr.h"
 #include "chainparams.h"
 #include "consensus/funding.h"
 #include "fs.h"
 #include "key_io.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
 #include "amount.h"
@@ -14,7 +14,7 @@
 #include <string>
 #include <set>
 #include <vector>
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 
 // To run tests:

src/gtest/test_joinsplit.cpp

@@ -1,10 +1,10 @@
 #include <gtest/gtest.h>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 
 #include "zcash/prf.h"
-#include "util.h"
+#include "util/system.h"
 #include "streams.h"
 #include "version.h"
 #include "serialize.h"

src/gtest/test_mempool.cpp

@@ -8,7 +8,7 @@
 #include "primitives/transaction.h"
 #include "txmempool.h"
 #include "policy/fees.h"
-#include "util.h"
+#include "util/system.h"
 
 // Implementation is in test_checktransaction.cpp
 extern CMutableTransaction GetValidTransaction(uint32_t consensusBranchId=SPROUT_BRANCH_ID);

src/gtest/test_mempoollimit.cpp

@@ -8,7 +8,7 @@
 #include "arith_uint256.h"
 #include "mempool_limit.h"
 #include "gtest/utils.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "utiltest.h"
 #include "transaction_builder.h"
 

src/gtest/test_merkletree.cpp

@@ -17,7 +17,7 @@
 
 #include <stdexcept>
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 #include "serialize.h"
 #include "streams.h"

src/gtest/test_metrics.cpp

@@ -2,7 +2,7 @@
 
 #include "metrics.h"
 #include "utiltest.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 
 TEST(Metrics, AtomicTimer) {

src/gtest/test_miner.cpp

@@ -5,7 +5,7 @@
 #include "chainparams.h"
 #include "key.h"
 #include "miner.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <variant>
 

src/gtest/test_rpc.cpp

@@ -8,7 +8,7 @@
 #include "primitives/block.h"
 #include "rpc/server.h"
 #include "streams.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 extern UniValue blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool txDetails = false);
 

src/gtest/test_timedata.cpp

@@ -8,7 +8,7 @@
 #include "timedata.h"
 #include "random.h"
 #include "netbase.h"
-#include "utiltime.h"
+#include "util/time.h"
 
 using ::testing::StrictMock;
 

src/gtest/test_txid.cpp

@@ -4,8 +4,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 /*
  Test that removing #1144 succeeded by verifying the hash of a transaction is over the entire serialized form.

src/gtest/utils.h

@@ -2,7 +2,7 @@
 #define BITCOIN_GTEST_UTILS_H
 
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "key_io.h"
 
 int GenZero(int n);

src/httprpc.cpp

@@ -7,8 +7,8 @@
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "ui_interface.h"
 #include "crypto/hmac_sha256.h"
 #include <stdio.h>

src/httpserver.cpp

@@ -7,7 +7,7 @@
 
 #include "chainparamsbase.h"
 #include "compat.h"
-#include "util.h"
+#include "util/system.h"
 #include "netbase.h"
 #include "rpc/protocol.h" // For HTTP status codes
 #include "sync.h"

src/init.cpp

@@ -38,8 +38,8 @@
 #include "txdb.h"
 #include "torcontrol.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"

src/key_io.cpp

@@ -8,7 +8,7 @@
 #include <base58.h>
 #include <bech32.h>
 #include <script/script.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <rust/address.h>
 

src/keystore.cpp

@@ -8,7 +8,7 @@
 
 #include "key.h"
 #include "pubkey.h"
-#include "util.h"
+#include "util/system.h"
 
 
 bool CKeyStore::AddKey(const CKey &key) {

src/logging.cpp

@@ -8,7 +8,7 @@
 
 #include "fs.h"
 #include "serialize.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <set>
 

src/main.cpp

@@ -29,8 +29,8 @@
 #include "txmempool.h"
 #include "ui_interface.h"
 #include "undo.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 #include "wallet/asyncrpcoperation_sendmany.h"
 #include "wallet/asyncrpcoperation_shieldcoinbase.h"

src/mempool_limit.cpp

@@ -9,7 +9,7 @@
 #include "random.h"
 #include "serialize.h"
 #include "timedata.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "version.h"
 
 const TxWeight ZERO_WEIGHT = TxWeight(0, 0);

src/merkleblock.cpp

@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "consensus/consensus.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 CMerkleBlock::CMerkleBlock(const CBlock& block, CBloomFilter& filter)
 {

src/metrics.cpp

@@ -9,10 +9,10 @@
 #include "main.h"
 #include "timedata.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utiltime.h"
-#include "utilmoneystr.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/time.h"
+#include "util/moneystr.h"
+#include "util/strencodings.h"
 
 #include <boost/range/irange.hpp>
 #include <boost/thread.hpp>

src/miner.cpp

@@ -31,8 +31,8 @@
 #include "timedata.h"
 #include "transaction_builder.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilmoneystr.h"
+#include "util/system.h"
+#include "util/moneystr.h"
 #include "validationinterface.h"
 
 #include <librustzcash.h>

src/net.h

@@ -18,7 +18,7 @@
 #include "streams.h"
 #include "sync.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "chainparams.h"
 
 #include <atomic>

src/netbase.cpp

@@ -14,8 +14,8 @@
 #include "sync.h"
 #include "uint256.h"
 #include "random.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #ifdef HAVE_GETADDRINFO_A
 #include <netdb.h>

src/noui.cpp

@@ -7,7 +7,7 @@
 #include "noui.h"
 
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <cstdio>
 #include <stdint.h>

src/policy/fees.cpp

@@ -9,7 +9,7 @@
 #include "primitives/transaction.h"
 #include "streams.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 
 void TxConfirmStats::Initialize(std::vector<double>& defaultBuckets,
                                 unsigned int maxConfirms, double _decay, std::string _dataTypeString)

src/policy/policy.cpp

@@ -9,8 +9,8 @@
 
 #include "main.h"
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 
     /**

src/primitives/block.cpp

@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "crypto/common.h"
 
 #include <rust/constants.h>

src/primitives/transaction.cpp

@@ -8,7 +8,7 @@
 
 #include "hash.h"
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <rust/transaction.h>
 

src/protocol.cpp

@@ -6,8 +6,8 @@
 
 #include "protocol.h"
 
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #ifndef WIN32
 # include <arpa/inet.h>

src/random.cpp

@@ -11,7 +11,7 @@
 #include "compat.h" // for Windows API
 #endif
 #include "logging.h"  // for LogPrint()
-#include "utiltime.h" // for GetTime()
+#include "util/time.h" // for GetTime()
 
 #include <limits>
 

src/rest.cpp

@@ -13,7 +13,7 @@
 #include "streams.h"
 #include "sync.h"
 #include "txmempool.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "version.h"
 
 #include <boost/algorithm/string.hpp>

src/rpc/blockchain.cpp

@@ -17,7 +17,7 @@
 #include "rpc/server.h"
 #include "streams.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdint.h>
 

src/rpc/client.cpp

@@ -6,7 +6,7 @@
 
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <set>
 #include <stdint.h>

src/rpc/mining.cpp

@@ -22,7 +22,7 @@
 #include "pow.h"
 #include "rpc/server.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #include "validationinterface.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"

src/rpc/misc.cpp

@@ -13,7 +13,7 @@
 #include "netbase.h"
 #include "rpc/server.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"
 #include "wallet/walletdb.h"

src/rpc/net.cpp

@@ -12,7 +12,7 @@
 #include "protocol.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "util.h"
+#include "util/system.h"
 #include "version.h"
 #include "deprecation.h"
 

src/rpc/protocol.cpp

@@ -8,9 +8,9 @@
 
 #include "random.h"
 #include "tinyformat.h"
-#include "util.h"
-#include "utilstrencodings.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/strencodings.h"
+#include "util/time.h"
 #include "version.h"
 
 #include <stdint.h>

src/rpc/server.cpp

@@ -12,8 +12,8 @@
 #include "random.h"
 #include "sync.h"
 #include "ui_interface.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "asyncrpcqueue.h"
 
 #include <memory>

src/script/script.cpp

@@ -7,7 +7,7 @@
 #include "script.h"
 
 #include "tinyformat.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 using namespace std;
 

src/script/sigcache.cpp

@@ -10,7 +10,7 @@
 #include "pubkey.h"
 #include "random.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/thread.hpp>
 #include <boost/unordered_set.hpp>

src/script/standard.cpp

@@ -8,8 +8,8 @@
 
 #include "pubkey.h"
 #include "script/script.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 
 using namespace std;

src/sendalert.cpp

@@ -43,8 +43,8 @@ the bad alert.
 #include "alert.h"
 #include "init.h"
 
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 #include "key.h"
 #include "clientversion.h"
 #include "chainparams.h"

src/sync.cpp

@@ -6,7 +6,7 @@
 #include "sync.h"
 
 #include "logging.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <stdio.h>
 

src/test/DoS_tests.cpp

@@ -16,7 +16,7 @@
 #include "pow.h"
 #include "script/sign.h"
 #include "serialize.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 

src/test/alert_tests.cpp

@@ -18,7 +18,7 @@
 #include "rpc/server.h"
 #include "serialize.h"
 #include "streams.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "utiltest.h"
 #include "warnings.h"
 

src/test/allocator_tests.cpp

@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "util.h"
+#include "util/system.h"
 
 #include "support/allocators/secure.h"
 #include "test/test_bitcoin.h"

src/test/base32_tests.cpp

@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <boost/test/unit_test.hpp>

src/test/base58_tests.cpp

@@ -15,8 +15,8 @@
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 
 #include <univalue.h>
 

src/test/base64_tests.cpp

@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <boost/test/unit_test.hpp>

src/test/bech32_tests.cpp

@@ -4,7 +4,7 @@
 
 #include "bech32.h"
 #include "test/test_bitcoin.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <boost/test/unit_test.hpp>
 

src/test/bip32_tests.cpp

@@ -8,8 +8,8 @@
 #include "key.h"
 #include "key_io.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <string>

src/test/bloom_tests.cpp

@@ -13,8 +13,8 @@
 #include "serialize.h"
 #include "streams.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>

src/test/checkblock_tests.cpp

@@ -9,7 +9,7 @@
 #include "main.h"
 #include "proof_verifier.h"
 #include "test/test_bitcoin.h"
-#include "utiltime.h"
+#include "util/time.h"
 #include "zcash/Proof.hpp"
 
 #include <cstdio>

src/test/checkqueue_tests.cpp

@@ -3,8 +3,8 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "util.h"
-#include "utiltime.h"
+#include "util/system.h"
+#include "util/time.h"
 
 #include "test/test_bitcoin.h"
 #include "checkqueue.h"

src/test/coins_tests.cpp

@@ -7,7 +7,7 @@
 #include "test_random.h"
 #include "script/standard.h"
 #include "uint256.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 #include "consensus/validation.h"
 #include "main.h"

src/test/compress_tests.cpp

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

src/test/convertbits_tests.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 <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <test/test_bitcoin.h>
 #include <zcash/NoteEncryption.hpp>
 

src/test/crypto_tests.cpp

@@ -12,7 +12,7 @@
 #include "crypto/hmac_sha256.h"
 #include "crypto/hmac_sha512.h"
 #include "test_random.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>

src/test/getarg_tests.cpp

@@ -3,7 +3,7 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 
 #include <string>

src/test/hash_tests.cpp

@@ -4,7 +4,7 @@
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
 #include "hash.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 #include "test/test_bitcoin.h"
 
 #include <vector>

src/test/key_tests.cpp

@@ -9,8 +9,8 @@
 #include "key_io.h"
 #include "script/script.h"
 #include "uint256.h"
-#include "util.h"
-#include "utilstrencodings.h"
+#include "util/system.h"
+#include "util/strencodings.h"
 #include "utiltest.h"
 #include "test/test_bitcoin.h"
 

src/test/mempool_tests.cpp

@@ -6,7 +6,7 @@
 #include "consensus/upgrades.h"
 #include "main.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 

src/test/miner_tests.cpp

@@ -9,7 +9,7 @@
 #include "miner.h"
 #include "pubkey.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "crypto/equihash.h"
 //#include "pow/tromp/equi_miner.h"
 

src/test/policyestimator_tests.cpp

@@ -6,7 +6,7 @@
 #include "policy/fees.h"
 #include "txmempool.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include "test/test_bitcoin.h"
 

src/test/pow_tests.cpp

@@ -5,7 +5,7 @@
 
 #include "main.h"
 #include "pow.h"
-#include "util.h"
+#include "util/system.h"
 #include "utiltest.h"
 #include "test/test_bitcoin.h"
 

src/test/rpc_tests.cpp

@@ -10,7 +10,7 @@
 #include "key_io.h"
 #include "main.h"
 #include "netbase.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"

src/test/script_tests.cpp

@@ -14,7 +14,7 @@
 #include "script/script.h"
 #include "script/script_error.h"
 #include "script/sign.h"
-#include "util.h"
+#include "util/system.h"
 #include "test/test_bitcoin.h"
 #include "test/test_util.h"
 

src/test/serialize_tests.cpp

@@ -7,7 +7,7 @@
 #include "streams.h"
 #include "hash.h"
 #include "test/test_bitcoin.h"
-#include "utilstrencodings.h"
+#include "util/strencodings.h"
 
 #include <array>
 #include <optional>