merge bitcoin#14555: Move util files to directory

(script modified to account for Dash backports, doesn't account for rebasing) ------------- BEGIN 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/utilmemory.h src/util/memory.h 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 git mv src/utilasmap.h src/util/asmap.h git mv src/utilasmap.cpp src/util/asmap.cpp git mv src/utilstring.h src/util/string.h git mv src/utilstring.cpp src/util/string.cpp gsed -i 's/<util\.h>/<util\/system\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utilmemory\.h>/<util\/memory\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utilmoneystr\.h>/<util\/moneystr\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utilstrencodings\.h>/<util\/strencodings\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utiltime\.h>/<util\/time\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utilasmap\.h>/<util\/asmap\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/<utilstring\.h>/<util\/string\.h>/g' $(git ls-files 'src/*.h' 'src/*.cpp') gsed -i 's/BITCOIN_UTIL_H/BITCOIN_UTIL_SYSTEM_H/g' src/util/system.h gsed -i 's/BITCOIN_UTILMEMORY_H/BITCOIN_UTIL_MEMORY_H/g' src/util/memory.h gsed -i 's/BITCOIN_UTILMONEYSTR_H/BITCOIN_UTIL_MONEYSTR_H/g' src/util/moneystr.h gsed -i 's/BITCOIN_UTILSTRENCODINGS_H/BITCOIN_UTIL_STRENCODINGS_H/g' src/util/strencodings.h gsed -i 's/BITCOIN_UTILTIME_H/BITCOIN_UTIL_TIME_H/g' src/util/time.h gsed -i 's/BITCOIN_UTILASMAP_H/BITCOIN_UTIL_ASMAP_H/g' src/util/asmap.h gsed -i 's/BITCOIN_UTILSTRING_H/BITCOIN_UTIL_STRING_H/g' src/util/string.h gsed -i 's/ util\.$h\|cpp$/ util\/system\.\1/g' src/Makefile.am gsed -i 's/utilmemory\.$h\|cpp$/util\/memory\.\1/g' src/Makefile.am gsed -i 's/utilmoneystr\.$h\|cpp$/util\/moneystr\.\1/g' src/Makefile.am gsed -i 's/utilstrencodings\.$h\|cpp$/util\/strencodings\.\1/g' src/Makefile.am gsed -i 's/utiltime\.$h\|cpp$/util\/time\.\1/g' src/Makefile.am gsed -i 's/utilasmap\.$h\|cpp$/util\/asmap\.\1/g' src/Makefile.am gsed -i 's/utilstring\.$h\|cpp$/util\/string\.\1/g' src/Makefile.am gsed -i 's/-> util ->/-> util\/system ->/' test/lint/lint-circular-dependencies.sh gsed -i 's/src\/util\.cpp/src\/util\/system\.cpp/g' test/lint/lint-format-strings.py test/lint/lint-locale-dependence.sh gsed -i 's/src\/utilmoneystr\.cpp/src\/util\/moneystr\.cpp/g' test/lint/lint-locale-dependence.sh gsed -i 's/src\/utilstrencodings\.$h\|cpp$/src\/util\/strencodings\.\1/g' test/lint/lint-locale-dependence.sh ------------- END SCRIPT ---------------
dashpay · Jun 27, 2021 · ef4dfa8 · ef4dfa8
1 parent 9e067f8
commit ef4dfa8
Show file tree

Hide file tree

Showing 186 changed files with 306 additions and 306 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -260,13 +260,13 @@ BITCOIN_CORE_H = \
   ui_interface.h \
   undo.h \
   unordered_lru_cache.h \
-  util.h \
-  utilasmap.h \
-  utilmemory.h \
-  utilmoneystr.h \
-  utilstring.h \
-  utiltime.h \
-  utilthreadnames.h \
+  util/system.h \
+  util/asmap.h \
+  util/memory.h \
+  util/moneystr.h \
+  util/string.h \
+  util/time.h \
+  util/threadnames.h \
   validation.h \
   validationinterface.h \
   versionbits.h \
@@ -529,8 +529,8 @@ libdash_consensus_a_SOURCES = \
   tinyformat.h \
   uint256.cpp \
   uint256.h \
-  utilstrencodings.cpp \
-  utilstrencodings.h \
+  util/strencodings.cpp \
+  util/strencodings.h \
   version.h
 
 # common: shared between dashd, and dash-qt and non-server tools
@@ -588,13 +588,13 @@ libdash_util_a_SOURCES = \
   support/cleanse.cpp \
   sync.cpp \
   threadinterrupt.cpp \
-  util.cpp \
-  utilasmap.cpp \
-  utilmoneystr.cpp \
-  utilstrencodings.cpp \
-  utiltime.cpp \
-  utilstring.cpp \
-  utilthreadnames.cpp \
+  util/system.cpp \
+  util/asmap.cpp \
+  util/moneystr.cpp \
+  util/strencodings.cpp \
+  util/time.cpp \
+  util/string.cpp \
+  util/threadnames.cpp \
   $(BITCOIN_CORE_H)
 
 if GLIBC_BACK_COMPAT

diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -12,7 +12,7 @@
 #include <random.h>
 #include <streams.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 namespace {
 

diff --git a/src/addrman.h b/src/addrman.h
@@ -13,7 +13,7 @@
 #include <sync.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <fs.h>
 #include <hash.h>

diff --git a/src/arith_uint256.cpp b/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>

diff --git a/src/base58.cpp b/src/base58.cpp
@@ -6,8 +6,8 @@
 
 #include <hash.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
-#include <utilstring.h>
+#include <util/strencodings.h>
+#include <util/string.h>
 
 #include <assert.h>
 #include <stdint.h>

diff --git a/src/batchedlogger.cpp b/src/batchedlogger.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <batchedlogger.h>
-#include <util.h>
+#include <util/system.h>
 
 CBatchedLogger::CBatchedLogger(BCLog::LogFlags _category, const std::string& _header) :
     accept(LogAcceptCategory(_category)), header(_header)

diff --git a/src/bench/bench_dash.cpp b/src/bench/bench_dash.cpp
@@ -8,7 +8,7 @@
 #include <key.h>
 #include <stacktraces.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 #include <random.h>
 
 #include <boost/lexical_cast.hpp>

diff --git a/src/bench/bls.cpp b/src/bench/bls.cpp
@@ -5,7 +5,7 @@
 #include <bench/bench.h>
 #include <random.h>
 #include <bls/bls_worker.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 #include <iostream>
 

diff --git a/src/bench/checkqueue.cpp b/src/bench/checkqueue.cpp
@@ -3,7 +3,7 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include <bench/bench.h>
-#include <util.h>
+#include <util/system.h>
 #include <validation.h>
 #include <checkqueue.h>
 #include <prevector.h>

diff --git a/src/bench/crypto_hash.cpp b/src/bench/crypto_hash.cpp
@@ -10,7 +10,7 @@
 #include <hash.h>
 #include <random.h>
 #include <uint256.h>
-#include <utiltime.h>
+#include <util/time.h>
 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
 #include <crypto/sha256.h>

diff --git a/src/bench/examples.cpp b/src/bench/examples.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <validation.h>
-#include <utiltime.h>
+#include <util/time.h>
 
 // Sanity test: this should loop ten times, and
 // min/max/average should be close to 100ms.

diff --git a/src/bench/string_cast.cpp b/src/bench/string_cast.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <boost/lexical_cast.hpp>
 #include <string>

diff --git a/src/bench/util_time.cpp b/src/bench/util_time.cpp
@@ -4,7 +4,7 @@
 
 #include <bench/bench.h>
 
-#include <utiltime.h>
+#include <util/time.h>
 
 static void BenchTimeDeprecated(benchmark::State& state)
 {

diff --git a/src/blockencodings.cpp b/src/blockencodings.cpp
@@ -11,7 +11,7 @@
 #include <streams.h>
 #include <txmempool.h>
 #include <validation.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <unordered_map>
 

diff --git a/src/bls/bls.h b/src/bls/bls.h
@@ -8,7 +8,7 @@
 #include <hash.h>
 #include <serialize.h>
 #include <uint256.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 // bls-dash uses relic, which may define DEBUG and ERROR, which leads to many warnings in some build setups
 #undef ERROR

diff --git a/src/bls/bls_worker.cpp b/src/bls/bls_worker.cpp
@@ -6,7 +6,7 @@
 #include <hash.h>
 #include <serialize.h>
 
-#include <util.h>
+#include <util/system.h>
 
 #include <memory>
 #include <utility>

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -8,8 +8,8 @@
 #include <consensus/merkle.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <arith_uint256.h>
 

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -6,8 +6,8 @@
 #include <chainparamsbase.h>
 
 #include <tinyformat.h>
-#include <util.h>
-#include <utilmemory.h>
+#include <util/system.h>
+#include <util/memory.h>
 
 #include <assert.h>
 

diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -7,7 +7,7 @@
 
 #include <sync.h>
 #include <tinyformat.h>
-#include <utilthreadnames.h>
+#include <util/threadnames.h>
 
 #include <algorithm>
 #include <vector>

diff --git a/src/coinjoin/coinjoin-client-options.cpp b/src/coinjoin/coinjoin-client-options.cpp
@@ -4,7 +4,7 @@
 
 #include <coinjoin/coinjoin-client-options.h>
 
-#include <util.h>
+#include <util/system.h>
 #include <univalue.h>
 
 #include <cassert>

diff --git a/src/coinjoin/coinjoin-client.cpp b/src/coinjoin/coinjoin-client.cpp
@@ -15,8 +15,8 @@
 #include <net_processing.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>
 #include <wallet/coincontrol.h>

diff --git a/src/coinjoin/coinjoin-server.cpp b/src/coinjoin/coinjoin-server.cpp
@@ -15,8 +15,8 @@
 #include <netmessagemaker.h>
 #include <script/interpreter.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <version.h>
 

diff --git a/src/coinjoin/coinjoin.cpp b/src/coinjoin/coinjoin.cpp
@@ -11,8 +11,8 @@
 #include <netmessagemaker.h>
 #include <script/sign.h>
 #include <txmempool.h>
-#include <util.h>
-#include <utilmoneystr.h>
+#include <util/system.h>
+#include <util/moneystr.h>
 #include <validation.h>
 #include <bls/bls.h>
 #include <masternode/activemasternode.h>

diff --git a/src/consensus/merkle.cpp b/src/consensus/merkle.cpp
@@ -4,7 +4,7 @@
 
 #include <consensus/merkle.h>
 #include <hash.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 /*     WARNING! If you're reading this because you're learning about crypto
        and/or designing a new system that will use merkle trees, keep in mind

diff --git a/src/consensus/tx_verify.cpp b/src/consensus/tx_verify.cpp
@@ -12,7 +12,7 @@
 // TODO remove the following dependencies
 #include <chain.h>
 #include <coins.h>
-#include <utilmoneystr.h>
+#include <util/moneystr.h>
 
 bool IsFinalTx(const CTransaction &tx, int nBlockHeight, int64_t nBlockTime)
 {

diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -10,8 +10,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>

diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -13,9 +13,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 <spentindex.h>
 

diff --git a/src/dash-cli.cpp b/src/dash-cli.cpp
@@ -14,8 +14,8 @@
 #include <rpc/client.h>
 #include <rpc/protocol.h>
 #include <stacktraces.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 
 #include <memory>
 #include <stdio.h>

diff --git a/src/dash-tx.cpp b/src/dash-tx.cpp
@@ -17,9 +17,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 <memory>
 #include <stdio.h>

diff --git a/src/dashd.cpp b/src/dashd.cpp
@@ -15,11 +15,11 @@
 #include <rpc/server.h>
 #include <init.h>
 #include <noui.h>
-#include <util.h>
+#include <util/system.h>
 #include <httpserver.h>
 #include <httprpc.h>
-#include <utilstrencodings.h>
-#include <utilthreadnames.h>
+#include <util/strencodings.h>
+#include <util/threadnames.h>
 #include <walletinitinterface.h>
 #include <stacktraces.h>
 

diff --git a/src/dbwrapper.h b/src/dbwrapper.h
@@ -9,8 +9,8 @@
 #include <fs.h>
 #include <serialize.h>
 #include <streams.h>
-#include <util.h>
-#include <utilstrencodings.h>
+#include <util/system.h>
+#include <util/strencodings.h>
 #include <version.h>
 
 #include <typeindex>

diff --git a/src/flat-database.h b/src/flat-database.h
@@ -10,7 +10,7 @@
 #include <fs.h>
 #include <hash.h>
 #include <streams.h>
-#include <util.h>
+#include <util/system.h>
 
 /**
 *   Generic Dumping and Loading

diff --git a/src/governance/governance-classes.cpp b/src/governance/governance-classes.cpp
@@ -10,7 +10,7 @@
 #include <primitives/transaction.h>
 #include <script/standard.h>
 #include <timedata.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 #include <validation.h>
 
 #include <boost/algorithm/string.hpp>

diff --git a/src/governance/governance-validators.cpp b/src/governance/governance-validators.cpp
@@ -8,7 +8,7 @@
 #include <key_io.h>
 #include <timedata.h>
 #include <tinyformat.h>
-#include <utilstrencodings.h>
+#include <util/strencodings.h>
 
 #include <algorithm>
 

diff --git a/src/governance/governance-vote.cpp b/src/governance/governance-vote.cpp
@@ -9,7 +9,7 @@
 #include <masternode/masternode-sync.h>
 #include <messagesigner.h>
 #include <net.h>
-#include <util.h>
+#include <util/system.h>
 
 #include <evo/deterministicmns.h>