Renamed and moved util.h/cpp files to util/system.h & util/system.cpp

PIVX-Project · May 11, 2021 · 2e35dea · 2e35dea
1 parent fb800e1
commit 2e35dea
Show file tree

Hide file tree

Showing 104 changed files with 107 additions and 107 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -431,7 +431,7 @@ set(UTIL_SOURCES
         ./src/arith_uint256.cpp
         ./src/uint256.cpp
         ./src/util/threadnames.cpp
-        ./src/util.cpp
+        ./src/util/system.cpp
         ./src/utilstrencodings.cpp
         ./src/utilmoneystr.cpp
         ./src/utiltime.cpp

diff --git a/src/Makefile.am b/src/Makefile.am
@@ -284,7 +284,7 @@ BITCOIN_CORE_H = \
   uint256.h \
   undo.h \
   util/memory.h \
-  util.h \
+  util/system.h \
   util/macros.h \
   util/threadnames.h \
   utilstrencodings.h \
@@ -548,7 +548,7 @@ libbitcoin_util_a_SOURCES = \
   sync.cpp \
   threadinterrupt.cpp \
   uint256.cpp \
-  util.cpp \
+  util/system.cpp \
   utilmoneystr.cpp \
   util/threadnames.cpp \
   utilstrencodings.cpp \

diff --git a/src/addrdb.cpp b/src/addrdb.cpp
@@ -14,7 +14,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
@@ -12,7 +12,7 @@
 #include "random.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <map>
 #include <set>

diff --git a/src/bench/bench_pivx.cpp b/src/bench/bench_pivx.cpp
@@ -6,7 +6,7 @@
 #include "bench.h"
 
 #include "key.h"
-#include "util.h"
+#include "util/system.h"
 
 int
 main(int argc, char** argv)

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.h"
-#include "util.h"
+#include "util/system.h"
 #include "checkqueue.h"
 #include "prevector.h"
 #include "random.h"

diff --git a/src/bip38.cpp b/src/bip38.cpp
@@ -6,7 +6,7 @@
 #include "base58.h"
 #include "hash.h"
 #include "pubkey.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "random.h"
 

diff --git a/src/blockassembler.cpp b/src/blockassembler.cpp
@@ -21,7 +21,7 @@
 #include "spork.h"
 #include "timedata.h"
 #include "txmempool.h"
-#include "util.h"
+#include "util/system.h"
 #include "validation.h"
 #include "validationinterface.h"
 

diff --git a/src/chain.h b/src/chain.h
@@ -18,7 +18,7 @@
 #include "timedata.h"
 #include "tinyformat.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 #include "libzerocoin/Denominations.h"
 
 #include <vector>

diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
@@ -7,7 +7,7 @@
 #include "chainparamsbase.h"
 
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <assert.h>
 

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
@@ -5,7 +5,7 @@
 
 #include "consensus/params.h"
 #include "consensus/upgrades.h"
-#include "util.h"
+#include "util/system.h"
 
 namespace Consensus {
 

diff --git a/src/core_read.cpp b/src/core_read.cpp
@@ -10,7 +10,7 @@
 #include "script/script.h"
 #include "serialize.h"
 #include "streams.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "version.h"
 

diff --git a/src/core_write.cpp b/src/core_write.cpp
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "streams.h"
 #include <univalue.h>
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 

diff --git a/src/crypter.cpp b/src/crypter.cpp
@@ -9,7 +9,7 @@
 #include "crypto/sha512.h"
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 #include "init.h"
 #include "uint256.h"
 

diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
@@ -4,7 +4,7 @@
 
 #include "dbwrapper.h"
 
-#include "util.h"
+#include "util/system.h"
 
 #include <leveldb/cache.h>
 #include <leveldb/env.h>

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

diff --git a/src/flatfile.cpp b/src/flatfile.cpp
@@ -8,7 +8,7 @@
 #include "flatfile.h"
 #include "logging.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 
 FlatFileSeq::FlatFileSeq(fs::path dir, const char* prefix, size_t chunk_size) :
     m_dir(std::move(dir)),

diff --git a/src/httprpc.cpp b/src/httprpc.cpp
@@ -13,7 +13,7 @@
 #include "rpc/server.h"
 #include "random.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "guiinterface.h"
 

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

diff --git a/src/init.cpp b/src/init.cpp
@@ -50,7 +50,7 @@
 #include "torcontrol.h"
 #include "guiinterface.h"
 #include "guiinterfaceutil.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "util/threadnames.h"
 #include "validation.h"

diff --git a/src/kernel.cpp b/src/kernel.cpp
@@ -12,7 +12,7 @@
 #include "policy/policy.h"
 #include "script/interpreter.h"
 #include "stakeinput.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "validation.h"
 #include "zpivchain.h"

diff --git a/src/keystore.cpp b/src/keystore.cpp
@@ -10,7 +10,7 @@
 #include "key.h"
 #include "script/script.h"
 #include "script/standard.h"
-#include "util.h"
+#include "util/system.h"
 
 
 bool CKeyStore::AddKey(const CKey& key)

diff --git a/src/libzerocoin/Coin.h b/src/libzerocoin/Coin.h
@@ -17,7 +17,7 @@
 #include "Params.h"
 #include "amount.h"
 #include "bignum.h"
-#include "util.h"
+#include "util/system.h"
 #include "key.h"
 
 namespace libzerocoin

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -15,7 +15,7 @@
 #include "net_processing.h"
 #include "spork.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 
 

diff --git a/src/masternode-sync.cpp b/src/masternode-sync.cpp
@@ -12,7 +12,7 @@
 #include "masternodeman.h"
 #include "netmessagemaker.h"
 #include "spork.h"
-#include "util.h"
+#include "util/system.h"
 #include "addrman.h"
 // clang-format on
 

diff --git a/src/masternode.cpp b/src/masternode.cpp
@@ -11,7 +11,7 @@
 #include "masternodeman.h"
 #include "netbase.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 #include "wallet/wallet.h"
 
 #define MASTERNODE_MIN_CONFIRMATIONS_REGTEST 1

diff --git a/src/masternode.h b/src/masternode.h
@@ -13,7 +13,7 @@
 #include "serialize.h"
 #include "sync.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 
 /* Depth of the block pinged by masternodes */
 static const unsigned int MNPING_DEPTH = 12;

diff --git a/src/masternodeconfig.cpp b/src/masternodeconfig.cpp
@@ -6,7 +6,7 @@
 
 #include "fs.h"
 #include "netbase.h"
-#include "util.h"
+#include "util/system.h"
 #include "guiinterface.h"
 #include <base58.h>
 

diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp
@@ -16,7 +16,7 @@
 #include "netmessagemaker.h"
 #include "net_processing.h"
 #include "spork.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <boost/thread/thread.hpp>
 

diff --git a/src/masternodeman.h b/src/masternodeman.h
@@ -13,7 +13,7 @@
 #include "masternode.h"
 #include "net.h"
 #include "sync.h"
-#include "util.h"
+#include "util/system.h"
 
 #define MASTERNODES_DUMP_SECONDS (15 * 60)
 #define MASTERNODES_DSEG_SECONDS (3 * 60 * 60)

diff --git a/src/messagesigner.cpp b/src/messagesigner.cpp
@@ -7,7 +7,7 @@
 #include "hash.h"
 #include "messagesigner.h"
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 const std::string strMessageMagic = "DarkNet Signed Message:\n";

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -20,7 +20,7 @@
 #include "primitives/block.h"
 #include "primitives/transaction.h"
 #include "timedata.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #ifdef ENABLE_WALLET
 #include "wallet/wallet.h"

diff --git a/src/netbase.cpp b/src/netbase.cpp
@@ -14,7 +14,7 @@
 #include "sync.h"
 #include "uint256.h"
 #include "random.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #include <atomic>

diff --git a/src/noui.cpp b/src/noui.cpp
@@ -8,7 +8,7 @@
 #include "noui.h"
 
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <cstdio>
 #include <stdint.h>

diff --git a/src/pivx-cli.cpp b/src/pivx-cli.cpp
@@ -10,7 +10,7 @@
 #include "fs.h"
 #include "rpc/client.h"
 #include "rpc/protocol.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #include <stdio.h>

diff --git a/src/pivx-tx.cpp b/src/pivx-tx.cpp
@@ -14,7 +14,7 @@
 #include "script/script.h"
 #include "script/sign.h"
 #include <univalue.h>
-#include "util.h"
+#include "util/system.h"
 #include "utilmoneystr.h"
 #include "utilstrencodings.h"
 

diff --git a/src/pivxd.cpp b/src/pivxd.cpp
@@ -12,7 +12,7 @@
 #include "masternodeconfig.h"
 #include "noui.h"
 #include "rpc/server.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <stdio.h>
 

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

diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
@@ -9,7 +9,7 @@
 
 #include "consensus/tx_verify.h" // for IsFinal()
 #include "tinyformat.h"
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 #include "validation.h"
 

diff --git a/src/pow.cpp b/src/pow.cpp
@@ -11,7 +11,7 @@
 #include "chainparams.h"
 #include "primitives/block.h"
 #include "uint256.h"
-#include "util.h"
+#include "util/system.h"
 
 #include <math.h>
 

diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp
@@ -11,7 +11,7 @@
 #include "script/sign.h"
 #include "tinyformat.h"
 #include "utilstrencodings.h"
-#include "util.h"
+#include "util/system.h"
 
 uint256 CBlockHeader::GetHash() const
 {

diff --git a/src/protocol.cpp b/src/protocol.cpp
@@ -7,7 +7,7 @@
 
 #include "protocol.h"
 
-#include "util.h"
+#include "util/system.h"
 #include "utilstrencodings.h"
 
 #ifndef WIN32

diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
@@ -19,7 +19,7 @@
 #include "net.h"
 #include "netbase.h"
 #include "guiinterface.h"
-#include "util.h"
+#include "util/system.h"
 #include "warnings.h"
 
 #include <stdint.h>