From 3e48fc1e6221818087c55e58c7154947d1aff066 Mon Sep 17 00:00:00 2001 From: furszy Date: Fri, 23 Apr 2021 00:50:34 -0300 Subject: [PATCH] Renamed and moved util.h/cpp files to util/system.h & util/system.cpp --- CMakeLists.txt | 2 +- src/Makefile.am | 4 ++-- src/addrdb.cpp | 2 +- src/addrman.h | 2 +- src/bench/bench_pivx.cpp | 2 +- src/bench/checkqueue.cpp | 2 +- src/bip38.cpp | 2 +- src/blockassembler.cpp | 2 +- src/chain.h | 2 +- src/chainparamsbase.cpp | 2 +- src/consensus/params.cpp | 2 +- src/core_read.cpp | 2 +- src/core_write.cpp | 2 +- src/crypter.cpp | 2 +- src/dbwrapper.cpp | 2 +- src/dbwrapper.h | 2 +- src/flatfile.cpp | 2 +- src/httprpc.cpp | 2 +- src/httpserver.cpp | 2 +- src/init.cpp | 2 +- src/kernel.cpp | 2 +- src/keystore.cpp | 2 +- src/libzerocoin/Coin.h | 2 +- src/masternode-payments.cpp | 2 +- src/masternode-sync.cpp | 2 +- src/masternode.cpp | 2 +- src/masternode.h | 2 +- src/masternodeconfig.cpp | 2 +- src/masternodeman.cpp | 2 +- src/masternodeman.h | 2 +- src/messagesigner.cpp | 2 +- src/miner.cpp | 2 +- src/netbase.cpp | 2 +- src/noui.cpp | 2 +- src/pivx-cli.cpp | 2 +- src/pivx-tx.cpp | 2 +- src/pivxd.cpp | 2 +- src/policy/fees.cpp | 2 +- src/policy/policy.cpp | 2 +- src/pow.cpp | 2 +- src/primitives/block.cpp | 2 +- src/protocol.cpp | 2 +- src/qt/clientmodel.cpp | 2 +- src/qt/guiutil.cpp | 2 +- src/qt/intro.cpp | 2 +- src/qt/optionsmodel.cpp | 2 +- src/qt/paymentserver.cpp | 2 +- src/qt/pivx.cpp | 2 +- src/qt/pivx/masternodeswidget.cpp | 2 +- src/qt/pivx/pivxgui.cpp | 2 +- src/qt/pivx/settings/settingsconsolewidget.cpp | 2 +- src/qt/pivx/settings/settingsinformationwidget.cpp | 2 +- src/qt/pivx/splash.cpp | 2 +- src/qt/rpcconsole.cpp | 2 +- src/qt/test/test_main.cpp | 2 +- src/qt/transactiontablemodel.cpp | 2 +- src/qt/utilitydialog.cpp | 2 +- src/rpc/blockchain.cpp | 2 +- src/rpc/misc.cpp | 2 +- src/rpc/net.cpp | 2 +- src/rpc/protocol.cpp | 2 +- src/rpc/server.cpp | 2 +- src/sapling/crypter_sapling.cpp | 2 +- src/sapling/sapling_validation.cpp | 2 +- src/script/ismine.cpp | 2 +- src/script/sigcache.cpp | 2 +- src/script/sign.cpp | 2 +- src/spork.h | 2 +- src/test/DoS_tests.cpp | 2 +- src/test/alert_tests.cpp | 2 +- src/test/allocator_tests.cpp | 2 +- src/test/base58_tests.cpp | 2 +- src/test/bloom_tests.cpp | 2 +- src/test/compress_tests.cpp | 2 +- src/test/getarg_tests.cpp | 2 +- src/test/key_tests.cpp | 2 +- src/test/librust/wallet_zkeys_tests.cpp | 2 +- src/test/mempool_tests.cpp | 2 +- src/test/miner_tests.cpp | 2 +- src/test/policyestimator_tests.cpp | 2 +- src/test/rpc_tests.cpp | 2 +- src/test/sighash_tests.cpp | 2 +- src/test/skiplist_tests.cpp | 2 +- src/test/util_tests.cpp | 2 +- src/timedata.cpp | 2 +- src/torcontrol.cpp | 2 +- src/txdb.cpp | 2 +- src/txmempool.cpp | 2 +- src/{util.cpp => util/system.cpp} | 2 +- src/{util.h => util/system.h} | 6 +++--- src/validation.cpp | 2 +- src/wallet/db.cpp | 2 +- src/wallet/hdchain.cpp | 2 +- src/wallet/rpcdump.cpp | 2 +- src/wallet/rpcwallet.cpp | 2 +- src/wallet/wallet.cpp | 2 +- src/wallet/wallet.h | 2 +- src/wallet/walletdb.cpp | 2 +- src/warnings.cpp | 2 +- src/zmq/zmqabstractnotifier.cpp | 2 +- src/zmq/zmqnotificationinterface.cpp | 2 +- src/zmq/zmqpublishnotifier.cpp | 2 +- src/zpiv/mintpool.cpp | 2 +- 103 files changed, 106 insertions(+), 106 deletions(-) rename src/{util.cpp => util/system.cpp} (99%) rename src/{util.h => util/system.h} (98%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe1298b90b9be..8ccff3d1251e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -417,7 +417,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 index f1d1646bf9ef8..2517edf8cbb4b 100644 --- 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 index cdd67f1f19a31..318bd7e963740 100644 --- 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 index 8729166865477..b78d391959aa6 100644 --- 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 #include diff --git a/src/bench/bench_pivx.cpp b/src/bench/bench_pivx.cpp index 9bf3993397cbb..aa3ac218b479e 100644 --- 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 index 5e1fa93fac5ef..6a1bfacfdd016 100644 --- 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 index fa4516cf98c9a..e83f81b1d09fe 100644 --- a/src/bip38.cpp +++ b/src/bip38.cpp @@ -8,7 +8,7 @@ #include "crypto/aes.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 index e500ffccc1ce2..c86a6b5e440d0 100644 --- 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 index 4a3e8250a8a2d..fd16e8e5f68c6 100644 --- 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 diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index 3b5b98b3dab8f..849a850c8587c 100644 --- 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 diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp index b0fdae2847556..ef28d107065cc 100644 --- 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 index b9a6eef164d06..9509b4015075a 100644 --- 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 index 266e95e0deebe..041fcc5563cff 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -13,7 +13,7 @@ #include "serialize.h" #include "streams.h" #include -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "utilstrencodings.h" diff --git a/src/crypter.cpp b/src/crypter.cpp index f0929f74fb538..83420a3c04864 100644 --- 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 index 5ac82fb2dc5fa..f44b613cf4972 100644 --- a/src/dbwrapper.cpp +++ b/src/dbwrapper.cpp @@ -4,7 +4,7 @@ #include "dbwrapper.h" -#include "util.h" +#include "util/system.h" #include #include diff --git a/src/dbwrapper.h b/src/dbwrapper.h index 3889651a9d71a..dd0a48c24b28e 100644 --- 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 diff --git a/src/flatfile.cpp b/src/flatfile.cpp index cc39bc3e77291..ec136272e7c3d 100644 --- 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 index 56bf3047c8b40..24db0d4554140 100644 --- 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 index 02317dbea12c8..ed88665cfe93f 100644 --- 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 index 943754b3b9041..002ff1f954b3d 100644 --- 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 index 0b41f9755ab9f..a764bef3af315 100644 --- 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 index 47e8fa5723b2c..09c3390b17c6c 100644 --- 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 index 290acc12af5fd..8860d41c48d69 100644 --- 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 index b06d8fb741b79..9ae558cfa265d 100644 --- 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 index a7352ebaf8033..7fcec9276c9be 100644 --- 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 index 2e566b56c9f88..a4780d0635c17 100644 --- 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 index 20f0bd1ab9bdd..048826fb393a3 100644 --- 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 index 265e4b91a5218..8e156b21a5121 100644 --- 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 diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index c4e52e57e5849..fd38d3e3873a5 100644 --- 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 diff --git a/src/masternodeman.h b/src/masternodeman.h index e675ad0f6684a..1859304df0ee4 100644 --- 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 index 386f47c868853..46df3e55b8241 100644 --- 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 index 68291fc60ef20..8aa545d9b1ea8 100644 --- 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 index 442260e58a813..12123fd47f13e 100644 --- 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 diff --git a/src/noui.cpp b/src/noui.cpp index 147d61cdb81eb..20b280ae8ecfc 100644 --- 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 #include diff --git a/src/pivx-cli.cpp b/src/pivx-cli.cpp index f98fcb1f619be..9775106c6d2e5 100644 --- 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 diff --git a/src/pivx-tx.cpp b/src/pivx-tx.cpp index 94259d7bfdc87..1621aff68ecf4 100644 --- a/src/pivx-tx.cpp +++ b/src/pivx-tx.cpp @@ -14,7 +14,7 @@ #include "script/script.h" #include "script/sign.h" #include -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "utilstrencodings.h" diff --git a/src/pivxd.cpp b/src/pivxd.cpp index bcde06ae07e09..ad02677ccc8fa 100644 --- 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 diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp index 93f789175260a..3e2c169c99c9e 100644 --- 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& defaultBuckets, unsigned int maxConfirms, double _decay) diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp index 41f61031449b9..deae2082bead1 100644 --- 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 index 384cb742957cc..6b41d9796956e 100644 --- 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 diff --git a/src/primitives/block.cpp b/src/primitives/block.cpp index 84c32be40eae3..e0b7fd2d618cc 100644 --- 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 index ea570180ff1b3..f40fc79aed7ed 100644 --- 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 index 136faffd829ee..51096dcabaa4a 100644 --- 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 diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp index c13d07b808c03..ba4a73b4336ad 100644 --- a/src/qt/guiutil.cpp +++ b/src/qt/guiutil.cpp @@ -17,7 +17,7 @@ #include "protocol.h" #include "script/script.h" #include "script/standard.h" -#include "util.h" +#include "util/system.h" #ifdef WIN32 #ifdef _WIN32_WINNT diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 1ed9cf7985989..28f8a1e99fdef 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -10,7 +10,7 @@ #include "fs.h" #include "guiutil.h" -#include "util.h" +#include "util/system.h" #include "qt/pivx/qtutils.h" #include diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp index 09c1a585bd806..7f4d39da2702d 100644 --- a/src/qt/optionsmodel.cpp +++ b/src/qt/optionsmodel.cpp @@ -18,7 +18,7 @@ #include "net.h" #include "netbase.h" #include "txdb.h" // for -dbcache defaults -#include "util.h" +#include "util/system.h" #ifdef ENABLE_WALLET #include "masternodeconfig.h" diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index f8265c4fd0276..a9554e7c5b30a 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -14,7 +14,7 @@ #include "base58.h" #include "chainparams.h" #include "guiinterface.h" -#include "util.h" +#include "util/system.h" #include "wallet/wallet.h" #include diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp index d0b9a4d76c68e..b96eddba42083 100644 --- a/src/qt/pivx.cpp +++ b/src/qt/pivx.cpp @@ -33,7 +33,7 @@ #include "init.h" #include "rpc/server.h" #include "guiinterface.h" -#include "util.h" +#include "util/system.h" #include "warnings.h" #ifdef ENABLE_WALLET diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/pivx/masternodeswidget.cpp index 722ade7abd02b..f9b32472259c5 100644 --- a/src/qt/pivx/masternodeswidget.cpp +++ b/src/qt/pivx/masternodeswidget.cpp @@ -21,7 +21,7 @@ #include "sync.h" #include "wallet/wallet.h" #include "askpassphrasedialog.h" -#include "util.h" +#include "util/system.h" #include "qt/pivx/optionbutton.h" #include #include diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivx/pivxgui.cpp index 77594265f9912..dadf137304d88 100644 --- a/src/qt/pivx/pivxgui.cpp +++ b/src/qt/pivx/pivxgui.cpp @@ -19,7 +19,7 @@ #include "qt/pivx/defaultdialog.h" #include "init.h" -#include "util.h" +#include "util/system.h" #include #include diff --git a/src/qt/pivx/settings/settingsconsolewidget.cpp b/src/qt/pivx/settings/settingsconsolewidget.cpp index 0e1fd165a542f..2f991f004171d 100644 --- a/src/qt/pivx/settings/settingsconsolewidget.cpp +++ b/src/qt/pivx/settings/settingsconsolewidget.cpp @@ -13,7 +13,7 @@ #include "chainparams.h" #include "sapling/key_io_sapling.h" -#include "util.h" +#include "util/system.h" #include "utilitydialog.h" #ifdef ENABLE_WALLET diff --git a/src/qt/pivx/settings/settingsinformationwidget.cpp b/src/qt/pivx/settings/settingsinformationwidget.cpp index 2294a3ddbf0d5..39fbf03ad7b1d 100644 --- a/src/qt/pivx/settings/settingsinformationwidget.cpp +++ b/src/qt/pivx/settings/settingsinformationwidget.cpp @@ -8,7 +8,7 @@ #include "clientmodel.h" #include "chainparams.h" #include "db.h" -#include "util.h" +#include "util/system.h" #include "guiutil.h" #include "qt/pivx/qtutils.h" diff --git a/src/qt/pivx/splash.cpp b/src/qt/pivx/splash.cpp index 149f72ff4fee7..fa07fe3931179 100644 --- a/src/qt/pivx/splash.cpp +++ b/src/qt/pivx/splash.cpp @@ -10,7 +10,7 @@ #include "init.h" #include "guiinterface.h" #include "networkstyle.h" -#include "util.h" +#include "util/system.h" #include "version.h" #include "guiutil.h" diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp index ac64e526d96b4..10da3b125dc4a 100644 --- a/src/qt/rpcconsole.cpp +++ b/src/qt/rpcconsole.cpp @@ -15,7 +15,7 @@ #include "chainparams.h" #include "netbase.h" -#include "util.h" +#include "util/system.h" #ifdef ENABLE_WALLET #include "wallet/wallet.h" #endif // ENABLE_WALLET diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index 5a23c4e9a394a..085aac9aff338 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -8,7 +8,7 @@ #include "config/pivx-config.h" #endif -#include "util.h" +#include "util/system.h" #include "uritests.h" #include diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp index da2aaa375ede0..1cea8e4f236ec 100644 --- a/src/qt/transactiontablemodel.cpp +++ b/src/qt/transactiontablemodel.cpp @@ -16,7 +16,7 @@ #include "interfaces/handler.h" #include "sync.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "wallet/wallet.h" #include diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index 089a58e5c8ea9..6eea16dd421be 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -15,7 +15,7 @@ #include "intro.h" #include "guiutil.h" #include "qt/pivx/qtutils.h" -#include "util.h" +#include "util/system.h" #include diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 395cbc6e79ecc..a3d8d975e68a5 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -18,7 +18,7 @@ #include "rpc/server.h" #include "sync.h" #include "txdb.h" -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "utilstrencodings.h" #include "hash.h" diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index 794b7fb4fd63c..7ae80a8d02353 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -16,7 +16,7 @@ #include "rpc/server.h" #include "spork.h" #include "timedata.h" -#include "util.h" +#include "util/system.h" #ifdef ENABLE_WALLET #include "wallet/wallet.h" #include "wallet/walletdb.h" diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 110fae7148706..66fc589ac83f8 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -14,7 +14,7 @@ #include "sync.h" #include "timedata.h" #include "guiinterface.h" -#include "util.h" +#include "util/system.h" #include "version.h" #include "validation.h" diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp index 6e4fe2ca930c4..a493397768e6b 100644 --- a/src/rpc/protocol.cpp +++ b/src/rpc/protocol.cpp @@ -9,7 +9,7 @@ #include "random.h" #include "tinyformat.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include "utiltime.h" #include "version.h" diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 482b317d8b324..7031123e07f38 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -13,7 +13,7 @@ #include "random.h" #include "sync.h" #include "guiinterface.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET diff --git a/src/sapling/crypter_sapling.cpp b/src/sapling/crypter_sapling.cpp index 2921ca1d99c7f..5860a4e89be48 100644 --- a/src/sapling/crypter_sapling.cpp +++ b/src/sapling/crypter_sapling.cpp @@ -7,7 +7,7 @@ #include "script/script.h" #include "script/standard.h" -#include "util.h" +#include "util/system.h" #include "uint256.h" #include "wallet/wallet.h" diff --git a/src/sapling/sapling_validation.cpp b/src/sapling/sapling_validation.cpp index e2ac6f248c990..838ad45d400f0 100644 --- a/src/sapling/sapling_validation.cpp +++ b/src/sapling/sapling_validation.cpp @@ -8,7 +8,7 @@ #include "consensus/consensus.h" // for MAX_BLOCK_SIZE_CURRENT #include "script/interpreter.h" // for SigHash #include "consensus/validation.h" // for CValidationState -#include "util.h" // for error() +#include "util/system.h" // for error() #include "consensus/upgrades.h" // for CurrentEpochBranchId() #include diff --git a/src/script/ismine.cpp b/src/script/ismine.cpp index e9312b4cf5e4f..7394e7879a0ca 100644 --- a/src/script/ismine.cpp +++ b/src/script/ismine.cpp @@ -11,7 +11,7 @@ #include "script/script.h" #include "script/sign.h" #include "script/standard.h" -#include "util.h" +#include "util/system.h" diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp index 37e0998da63c5..c5198131354ee 100644 --- a/src/script/sigcache.cpp +++ b/src/script/sigcache.cpp @@ -11,7 +11,7 @@ #include "pubkey.h" #include "random.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include diff --git a/src/script/sign.cpp b/src/script/sign.cpp index 7a34a872207b0..12878f4fb8856 100644 --- a/src/script/sign.cpp +++ b/src/script/sign.cpp @@ -12,7 +12,7 @@ #include "primitives/transaction.h" #include "script/standard.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" typedef std::vector valtype; diff --git a/src/spork.h b/src/spork.h index 89d18955e3f60..814261e6daa20 100644 --- a/src/spork.h +++ b/src/spork.h @@ -13,7 +13,7 @@ #include "net.h" #include "sporkid.h" #include "sync.h" -#include "util.h" +#include "util/system.h" #include "protocol.h" diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp index 349af79763f22..36146b6b47d81 100644 --- a/src/test/DoS_tests.cpp +++ b/src/test/DoS_tests.cpp @@ -17,7 +17,7 @@ #include "pow.h" #include "script/sign.h" #include "serialize.h" -#include "util.h" +#include "util/system.h" #include "validation.h" #include diff --git a/src/test/alert_tests.cpp b/src/test/alert_tests.cpp index 2a35d3b00bfc6..3d478c10beada 100644 --- a/src/test/alert_tests.cpp +++ b/src/test/alert_tests.cpp @@ -8,7 +8,7 @@ // #include "chainparams.h" -#include "util.h" +#include "util/system.h" #include "test/test_bitcoin.h" diff --git a/src/test/allocator_tests.cpp b/src/test/allocator_tests.cpp index 9976268ce9c2f..c22e21ad92b01 100644 --- a/src/test/allocator_tests.cpp +++ b/src/test/allocator_tests.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "util.h" +#include "util/system.h" #include "support/allocators/zeroafterfree.h" #include "test/test_pivx.h" diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp index 5e907e58ba3bf..11b50bbe9f5dc 100644 --- a/src/test/base58_tests.cpp +++ b/src/test/base58_tests.cpp @@ -12,7 +12,7 @@ #include "key.h" #include "script/script.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include "test/test_pivx.h" diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp index 9b99d10fca7c4..63dba3864b0f6 100644 --- a/src/test/bloom_tests.cpp +++ b/src/test/bloom_tests.cpp @@ -13,7 +13,7 @@ #include "serialize.h" #include "streams.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include "test/test_pivx.h" diff --git a/src/test/compress_tests.cpp b/src/test/compress_tests.cpp index 7dac65943ea6c..c0bcbb7ba67bb 100644 --- a/src/test/compress_tests.cpp +++ b/src/test/compress_tests.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "compressor.h" -#include "util.h" +#include "util/system.h" #include "test/test_pivx.h" #include diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp index 1bc35d541a84c..8d0eeb1b60446 100644 --- a/src/test/getarg_tests.cpp +++ b/src/test/getarg_tests.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "util.h" +#include "util/system.h" #include "test/test_pivx.h" #include diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp index 7cf278d01af2c..e33de3fe0f5b2 100644 --- a/src/test/key_tests.cpp +++ b/src/test/key_tests.cpp @@ -8,7 +8,7 @@ #include "base58.h" #include "script/script.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include "test_pivx.h" diff --git a/src/test/librust/wallet_zkeys_tests.cpp b/src/test/librust/wallet_zkeys_tests.cpp index 2093c9877551f..cb06c2efbfa8d 100644 --- a/src/test/librust/wallet_zkeys_tests.cpp +++ b/src/test/librust/wallet_zkeys_tests.cpp @@ -9,7 +9,7 @@ #include "sapling/address.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" -#include "util.h" +#include "util/system.h" #include /** diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp index 0ca5a76ae982e..da62536d506f9 100644 --- a/src/test/mempool_tests.cpp +++ b/src/test/mempool_tests.cpp @@ -6,7 +6,7 @@ #include "policy/feerate.h" #include "txmempool.h" -#include "util.h" +#include "util/system.h" #include diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index a0924ad7d1432..317d3d3b1c29d 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -11,7 +11,7 @@ #include "miner.h" #include "pubkey.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "validation.h" #include "wallet/wallet.h" diff --git a/src/test/policyestimator_tests.cpp b/src/test/policyestimator_tests.cpp index 9e9e576559854..91f672d52d814 100644 --- a/src/test/policyestimator_tests.cpp +++ b/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_pivx.h" diff --git a/src/test/rpc_tests.cpp b/src/test/rpc_tests.cpp index 042c2316cfedf..9a5cb364098f6 100644 --- a/src/test/rpc_tests.cpp +++ b/src/test/rpc_tests.cpp @@ -8,7 +8,7 @@ #include "base58.h" #include "netbase.h" -#include "util.h" +#include "util/system.h" #include "test/test_pivx.h" diff --git a/src/test/sighash_tests.cpp b/src/test/sighash_tests.cpp index 79ebc1aaad1a6..458cc4439fa57 100644 --- a/src/test/sighash_tests.cpp +++ b/src/test/sighash_tests.cpp @@ -11,7 +11,7 @@ #include "serialize.h" #include "script/script.h" #include "script/interpreter.h" -#include "util.h" +#include "util/system.h" #include "validation.h" #include "version.h" diff --git a/src/test/skiplist_tests.cpp b/src/test/skiplist_tests.cpp index 17ff327de6834..e8385f1e2b0df 100644 --- a/src/test/skiplist_tests.cpp +++ b/src/test/skiplist_tests.cpp @@ -5,7 +5,7 @@ #include "test/test_pivx.h" -#include "util.h" +#include "util/system.h" #include "validation.h" #include diff --git a/src/test/util_tests.cpp b/src/test/util_tests.cpp index c5774015c720a..a66a1ffa72858 100644 --- a/src/test/util_tests.cpp +++ b/src/test/util_tests.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "util.h" +#include "util/system.h" #include "clientversion.h" #include "primitives/transaction.h" diff --git a/src/timedata.cpp b/src/timedata.cpp index 4963fbdeaac68..e29cfcad0c966 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -9,7 +9,7 @@ #include "guiinterface.h" #include "netaddress.h" #include "sync.h" -#include "util.h" +#include "util/system.h" #include "warnings.h" diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp index c0439091852cc..38bbe9b38df88 100644 --- a/src/torcontrol.cpp +++ b/src/torcontrol.cpp @@ -10,7 +10,7 @@ #include "utilstrencodings.h" #include "netbase.h" #include "net.h" -#include "util.h" +#include "util/system.h" #include "crypto/hmac_sha256.h" #include diff --git a/src/txdb.cpp b/src/txdb.cpp index 4862fcbf94122..42c45ffcc3dd2 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -9,7 +9,7 @@ #include "random.h" #include "pow.h" #include "uint256.h" -#include "util.h" +#include "util/system.h" #include "zpiv/zerocoin.h" #include diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 42c8ff5bb93f2..e279bb679c61f 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -14,7 +14,7 @@ #include "reverse_iterate.h" #include "streams.h" #include "timedata.h" -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "utiltime.h" #include "version.h" diff --git a/src/util.cpp b/src/util/system.cpp similarity index 99% rename from src/util.cpp rename to src/util/system.cpp index cb8e7092e29ef..bc7085985c457 100644 --- a/src/util.cpp +++ b/src/util/system.cpp @@ -9,7 +9,7 @@ #include "config/pivx-config.h" #endif -#include "util.h" +#include "util/system.h" #include "chainparamsbase.h" #include "random.h" diff --git a/src/util.h b/src/util/system.h similarity index 98% rename from src/util.h rename to src/util/system.h index 99839c2845a97..8837ee8784bf5 100644 --- a/src/util.h +++ b/src/util/system.h @@ -9,8 +9,8 @@ * Server/client environment: argument handling, config file parsing, * thread wrappers */ -#ifndef BITCOIN_UTIL_H -#define BITCOIN_UTIL_H +#ifndef BITCOIN_UTIL_SYSTEM_H +#define BITCOIN_UTIL_SYSTEM_H #if defined(HAVE_CONFIG_H) #include "config/pivx-config.h" @@ -293,4 +293,4 @@ fs::path AbsPathForConfigVal(const fs::path& path, bool net_specific = true); */ int ScheduleBatchPriority(void); -#endif // BITCOIN_UTIL_H +#endif // BITCOIN_UTIL_SYSTEM_H diff --git a/src/validation.cpp b/src/validation.cpp index 4322514c34c9e..f7409d10b46c0 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -45,7 +45,7 @@ #include "txdb.h" #include "txmempool.h" #include "undo.h" -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "validationinterface.h" #include "warnings.h" diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp index 94b85583c1394..7ea9dfbab1e86 100644 --- a/src/wallet/db.cpp +++ b/src/wallet/db.cpp @@ -10,7 +10,7 @@ #include "guiinterfaceutil.h" #include "hash.h" #include "protocol.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include diff --git a/src/wallet/hdchain.cpp b/src/wallet/hdchain.cpp index 29e37b4fb69ef..642fb8217e9ae 100644 --- a/src/wallet/hdchain.cpp +++ b/src/wallet/hdchain.cpp @@ -7,7 +7,7 @@ #include "base58.h" #include "chainparams.h" #include "tinyformat.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" bool CHDChain::SetNull() diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp index d2af3d405655d..f476efde8d247 100644 --- a/src/wallet/rpcdump.cpp +++ b/src/wallet/rpcdump.cpp @@ -12,7 +12,7 @@ #include "script/script.h" #include "script/standard.h" #include "sync.h" -#include "util.h" +#include "util/system.h" #include "utilstrencodings.h" #include "utiltime.h" #include "wallet/wallet.h" diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index e75e86d209390..43ccaf5ff13f4 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -18,7 +18,7 @@ #include "policy/feerate.h" #include "rpc/server.h" #include "timedata.h" -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "wallet.h" #include "walletdb.h" diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index ef529162553b2..c00b6f23fa8ed 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -18,7 +18,7 @@ #include "script/sign.h" #include "scheduler.h" #include "spork.h" -#include "util.h" +#include "util/system.h" #include "utilmoneystr.h" #include "zpivchain.h" diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 27c225ad9ea0e..ae19ef76ac389 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -24,7 +24,7 @@ #include "primitives/transaction.h" #include "sapling/address.h" #include "guiinterface.h" -#include "util.h" +#include "util/system.h" #include "util/memory.h" #include "utilstrencodings.h" #include "validationinterface.h" diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp index dda03280b919b..0e7b50007caf0 100644 --- a/src/wallet/walletdb.cpp +++ b/src/wallet/walletdb.cpp @@ -15,7 +15,7 @@ #include "sapling/key_io_sapling.h" #include "serialize.h" #include "sync.h" -#include "util.h" +#include "util/system.h" #include "utiltime.h" #include "wallet/wallet.h" diff --git a/src/warnings.cpp b/src/warnings.cpp index 9be652d5c53ce..a7b607a48e446 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -7,7 +7,7 @@ #include "sync.h" #include "clientversion.h" -#include "util.h" +#include "util/system.h" RecursiveMutex cs_warnings; std::string strMiscWarning; diff --git a/src/zmq/zmqabstractnotifier.cpp b/src/zmq/zmqabstractnotifier.cpp index 53dac44aebc85..d39d0be0fd7d5 100644 --- a/src/zmq/zmqabstractnotifier.cpp +++ b/src/zmq/zmqabstractnotifier.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "zmqabstractnotifier.h" -#include "util.h" +#include "util/system.h" CZMQAbstractNotifier::~CZMQAbstractNotifier() diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index 110e2df44ba43..18dfe917bbe90 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -7,7 +7,7 @@ #include "version.h" #include "streams.h" -#include "util.h" +#include "util/system.h" void zmqError(const char *str) { diff --git a/src/zmq/zmqpublishnotifier.cpp b/src/zmq/zmqpublishnotifier.cpp index ee08858fe18e8..67998ee27f960 100644 --- a/src/zmq/zmqpublishnotifier.cpp +++ b/src/zmq/zmqpublishnotifier.cpp @@ -5,7 +5,7 @@ #include "zmqpublishnotifier.h" #include "chainparams.h" -#include "util.h" +#include "util/system.h" #include "crypto/common.h" #include "validation.h" // cs_main diff --git a/src/zpiv/mintpool.cpp b/src/zpiv/mintpool.cpp index 775f056919dc3..16c8f39b60518 100644 --- a/src/zpiv/mintpool.cpp +++ b/src/zpiv/mintpool.cpp @@ -3,7 +3,7 @@ // file COPYING or http://www.opensource.org/licenses/mit-license.php. #include "mintpool.h" -#include "util.h" +#include "util/system.h" CMintPool::CMintPool()