refactor: remove redundant filename prefixes for Dash-specific logic

src/Makefile.am

@@ -137,10 +137,10 @@ BITCOIN_CORE_H = \
   checkqueue.h \
   clientversion.h \
   coinjoin/coinjoin.h \
-  coinjoin/coinjoin-client.h \
-  coinjoin/coinjoin-client-options.h \
-  coinjoin/coinjoin-server.h \
-  coinjoin/coinjoin-util.h \
+  coinjoin/client.h \
+  coinjoin/options.h \
+  coinjoin/server.h \
+  coinjoin/util.h \
   coins.h \
   compat.h \
   compat/assumptions.h \
@@ -164,12 +164,12 @@ BITCOIN_CORE_H = \
   evo/specialtx.h \
   dsnotificationinterface.h \
   governance/governance.h \
-  governance/governance-classes.h \
-  governance/governance-exceptions.h \
-  governance/governance-object.h \
-  governance/governance-validators.h \
-  governance/governance-vote.h \
-  governance/governance-votedb.h \
+  governance/classes.h \
+  governance/exceptions.h \
+  governance/object.h \
+  governance/validators.h \
+  governance/vote.h \
+  governance/votedb.h \
   flat-database.h \
   hdchain.h \
   flatfile.h \
@@ -206,11 +206,11 @@ BITCOIN_CORE_H = \
   llmq/quorums_utils.h \
   logging.h \
   logging/timer.h \
-  masternode/activemasternode.h \
-  masternode/masternode-meta.h \
-  masternode/masternode-payments.h \
-  masternode/masternode-sync.h \
-  masternode/masternode-utils.h \
+  masternode/node.h \
+  masternode/meta.h \
+  masternode/payments.h \
+  masternode/sync.h \
+  masternode/utils.h \
   memusage.h \
   merkleblock.h \
   messagesigner.h \
@@ -329,8 +329,8 @@ libdash_server_a_SOURCES = \
   chain.cpp \
   checkpoints.cpp \
   coinjoin/coinjoin.cpp \
-  coinjoin/coinjoin-client-options.cpp \
-  coinjoin/coinjoin-server.cpp \
+  coinjoin/options.cpp \
+  coinjoin/server.cpp \
   consensus/tx_verify.cpp \
   dsnotificationinterface.cpp \
   evo/cbtx.cpp \
@@ -351,11 +351,11 @@ libdash_server_a_SOURCES = \
   init.cpp \
   dbwrapper.cpp \
   governance/governance.cpp \
-  governance/governance-classes.cpp \
-  governance/governance-object.cpp \
-  governance/governance-validators.cpp \
-  governance/governance-vote.cpp \
-  governance/governance-votedb.cpp \
+  governance/classes.cpp \
+  governance/object.cpp \
+  governance/validators.cpp \
+  governance/vote.cpp \
+  governance/votedb.cpp \
   llmq/quorums.cpp \
   llmq/quorums_blockprocessor.cpp \
   llmq/quorums_commitment.cpp \
@@ -369,11 +369,11 @@ libdash_server_a_SOURCES = \
   llmq/quorums_signing.cpp \
   llmq/quorums_signing_shares.cpp \
   llmq/quorums_utils.cpp \
-  masternode/activemasternode.cpp \
-  masternode/masternode-meta.cpp \
-  masternode/masternode-payments.cpp \
-  masternode/masternode-sync.cpp \
-  masternode/masternode-utils.cpp \
+  masternode/node.cpp \
+  masternode/meta.cpp \
+  masternode/payments.cpp \
+  masternode/sync.cpp \
+  masternode/utils.cpp \
   merkleblock.cpp \
   messagesigner.cpp \
   miner.cpp \
@@ -437,9 +437,9 @@ endif
 libdash_wallet_a_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
 libdash_wallet_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libdash_wallet_a_SOURCES = \
-  coinjoin/coinjoin-client.cpp \
-  coinjoin/coinjoin-client-options.cpp \
-  coinjoin/coinjoin-util.cpp \
+  coinjoin/client.cpp \
+  coinjoin/options.cpp \
+  coinjoin/util.cpp \
   interfaces/wallet.cpp \
   keepass.cpp \
   wallet/coincontrol.cpp \

src/coinjoin/coinjoin-client.cpp → src/coinjoin/client.cpp

@@ -2,14 +2,14 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/coinjoin-client.h>
-#include <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/client.h>
+#include <coinjoin/options.h>
 
 #include <consensus/validation.h>
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <masternode/masternode-sync.h>
-#include <masternode/masternode-meta.h>
+#include <masternode/sync.h>
+#include <masternode/meta.h>
 #include <netmessagemaker.h>
 #include <net_processing.h>
 #include <script/sign.h>

src/coinjoin/coinjoin-client.h → src/coinjoin/client.h

@@ -2,10 +2,10 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINJOIN_COINJOIN_CLIENT_H
-#define BITCOIN_COINJOIN_COINJOIN_CLIENT_H
+#ifndef BITCOIN_COINJOIN_CLIENT_H
+#define BITCOIN_COINJOIN_CLIENT_H
 
-#include <coinjoin/coinjoin-util.h>
+#include <coinjoin/util.h>
 #include <coinjoin/coinjoin.h>
 
 #include <utility>
@@ -252,4 +252,4 @@ class CCoinJoinClientManager
 
 void DoCoinJoinMaintenance(CConnman& connman);
 
-#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_H
+#endif // BITCOIN_COINJOIN_CLIENT_H

src/coinjoin/coinjoin.cpp

@@ -14,8 +14,8 @@
 #include <util/moneystr.h>
 #include <validation.h>
 #include <bls/bls.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/node.h>
+#include <masternode/sync.h>
 
 #include <llmq/quorums_instantsend.h>
 #include <llmq/quorums_chainlocks.h>

src/coinjoin/coinjoin-client-options.cpp → src/coinjoin/options.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 <coinjoin/coinjoin-client-options.h>
+#include <coinjoin/options.h>
 
 #include <util/system.h>
 #include <univalue.h>

src/coinjoin/coinjoin-client-options.h → src/coinjoin/options.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
-#define BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
+#ifndef BITCOIN_COINJOIN_OPTIONS_H
+#define BITCOIN_COINJOIN_OPTIONS_H
 
 #include <amount.h>
 #include <atomic>
@@ -91,4 +91,4 @@ class CCoinJoinClientOptions
     static void Init();
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
+#endif // BITCOIN_COINJOIN_OPTIONS_H

src/coinjoin/coinjoin-server.cpp → src/coinjoin/server.cpp

@@ -2,14 +2,14 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <coinjoin/coinjoin-server.h>
+#include <coinjoin/server.h>
 
-#include <masternode/activemasternode.h>
+#include <masternode/node.h>
 #include <evo/deterministicmns.h>
 #include <consensus/validation.h>
 #include <core_io.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>
 #include <script/interpreter.h>

src/coinjoin/coinjoin-server.h → src/coinjoin/server.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINJOIN_COINJOIN_SERVER_H
-#define BITCOIN_COINJOIN_COINJOIN_SERVER_H
+#ifndef BITCOIN_COINJOIN_SERVER_H
+#define BITCOIN_COINJOIN_SERVER_H
 
 #include <coinjoin/coinjoin.h>
 #include <net.h>
@@ -87,4 +87,4 @@ class CCoinJoinServer : public CCoinJoinBaseSession, public CCoinJoinBaseManager
     void GetJsonInfo(UniValue& obj) const;
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_SERVER_H
+#endif // BITCOIN_COINJOIN_SERVER_H

src/coinjoin/coinjoin-util.cpp → src/coinjoin/util.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 <coinjoin/coinjoin-util.h>
+#include <coinjoin/util.h>
 #include <consensus/validation.h>
 #include <net.h>
 #include <policy/fees.h>

src/coinjoin/coinjoin-util.h → src/coinjoin/util.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_COINJOIN_COINJOIN_UTIL_H
-#define BITCOIN_COINJOIN_COINJOIN_UTIL_H
+#ifndef BITCOIN_COINJOIN_UTIL_H
+#define BITCOIN_COINJOIN_UTIL_H
 
 #include <wallet/wallet.h>
 
@@ -137,4 +137,4 @@ class CTransactionBuilder
     int GetSizeOfCompactSizeDiff(size_t nAdd) const;
 };
 
-#endif // BITCOIN_COINJOIN_COINJOIN_UTIL_H
+#endif // BITCOIN_COINJOIN_UTIL_H

src/dsnotificationinterface.cpp

@@ -5,11 +5,11 @@
 #include <chainparams.h>
 #include <coinjoin/coinjoin.h>
 #ifdef ENABLE_WALLET
-#include <coinjoin/coinjoin-client.h>
+#include <coinjoin/client.h>
 #endif // ENABLE_WALLET
 #include <dsnotificationinterface.h>
 #include <governance/governance.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/sync.h>
 #include <validation.h>
 
 #include <evo/deterministicmns.h>

src/evo/mnauth.cpp

@@ -6,9 +6,9 @@
 
 #include <evo/deterministicmns.h>
 #include <llmq/quorums_utils.h>
-#include <masternode/activemasternode.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/node.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net.h>
 #include <net_processing.h>
 #include <netmessagemaker.h>

src/governance/governance-classes.cpp → src/governance/classes.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 <governance/governance-classes.h>
+#include <governance/classes.h>
 
 #include <core_io.h>
 #include <governance/governance.h>

src/governance/governance-classes.h → src/governance/classes.h

@@ -1,11 +1,11 @@
 // Copyright (c) 2014-2021 The Dash Core developers
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
+#ifndef BITCOIN_GOVERNANCE_CLASSES_H
+#define BITCOIN_GOVERNANCE_CLASSES_H
 
 #include <amount.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 #include <script/script.h>
 #include <script/standard.h>
 #include <uint256.h>
@@ -150,4 +150,4 @@ class CSuperblock : public CGovernanceObject
     bool IsExpired() const;
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
+#endif // BITCOIN_GOVERNANCE_CLASSES_H

src/governance/governance-exceptions.h → src/governance/exceptions.h

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
+#ifndef BITCOIN_GOVERNANCE_EXCEPTIONS_H
+#define BITCOIN_GOVERNANCE_EXCEPTIONS_H
 
 #include <exception>
 #include <iostream>
@@ -97,4 +97,4 @@ class CGovernanceException : public std::exception
     }
 };
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
+#endif // BITCOIN_GOVERNANCE_EXCEPTIONS_H

src/governance/governance.cpp

@@ -7,10 +7,10 @@
 #include <bloom.h>
 #include <chain.h>
 #include <consensus/validation.h>
-#include <governance/governance-classes.h>
-#include <governance/governance-validators.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <governance/classes.h>
+#include <governance/validators.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <net_processing.h>
 #include <netfulfilledman.h>
 #include <netmessagemaker.h>

src/governance/governance.h

@@ -7,7 +7,7 @@
 
 #include <cachemap.h>
 #include <cachemultimap.h>
-#include <governance/governance-object.h>
+#include <governance/object.h>
 
 class CBloomFilter;
 class CBlockIndex;

src/governance/governance-object.cpp → src/governance/object.cpp

@@ -2,14 +2,14 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/governance-object.h>
+#include <governance/object.h>
 
 #include <core_io.h>
 #include <evo/deterministicmns.h>
-#include <governance/governance-validators.h>
+#include <governance/validators.h>
 #include <governance/governance.h>
-#include <masternode/masternode-meta.h>
-#include <masternode/masternode-sync.h>
+#include <masternode/meta.h>
+#include <masternode/sync.h>
 #include <messagesigner.h>
 #include <net.h>
 #include <validation.h>

src/governance/governance-object.h → src/governance/object.h

@@ -2,12 +2,12 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#ifndef BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
-#define BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
+#ifndef BITCOIN_GOVERNANCE_OBJECT_H
+#define BITCOIN_GOVERNANCE_OBJECT_H
 
-#include <governance/governance-exceptions.h>
-#include <governance/governance-vote.h>
-#include <governance/governance-votedb.h>
+#include <governance/exceptions.h>
+#include <governance/vote.h>
+#include <governance/votedb.h>
 #include <logging.h>
 #include <sync.h>
 
@@ -329,4 +329,4 @@ class CGovernanceObject
 };
 
 
-#endif // BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
+#endif // BITCOIN_GOVERNANCE_OBJECT_H

src/governance/governance-validators.cpp → src/governance/validators.cpp

@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <governance/governance-object.h>
-#include <governance/governance-validators.h>
+#include <governance/object.h>
+#include <governance/validators.h>
 
 #include <key_io.h>
 #include <timedata.h>