sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-25 12:02:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove redundant filename prefixes for Dash-specific logic (#4475)

Browse Source 
* refactor: coinjoin/coinjoin-*[cpp/h] --> coinjoin/*.[cpp/h]

* refactor: governance/governance-*[cpp/h] --> governance/*.[cpp/h]

* refactor: masternode/masternode-*[cpp/h] --> masternode/*.[cpp/h]

* fix linter

Co-authored-by: UdjinM6 <UdjinM6@users.noreply.github.com>
This commit is contained in:
Kittywhiskers Van Gogh 2021-10-02 00:49:08 +05:30 committed by GitHub
parent 38aeb47cc4
commit cb1d4766f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
70 changed files with 197 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/Makefile.am
View File

@ -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 \

8
src/coinjoin/coinjoin-client.cpp → src/coinjoin/client.cpp
View File

@ -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>

8
src/coinjoin/coinjoin-client.h → src/coinjoin/client.h
View File

@ -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 @@ public:
void DoCoinJoinMaintenance(CConnman& connman);
#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_H
#endif // BITCOIN_COINJOIN_CLIENT_H

4
src/coinjoin/coinjoin.cpp
View File

@ -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>

2
src/coinjoin/coinjoin-client-options.cpp → src/coinjoin/options.cpp
View File

@ -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>

6
src/coinjoin/coinjoin-client-options.h → src/coinjoin/options.h
View File

@ -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 @@ private:
static void Init();
};
#endif // BITCOIN_COINJOIN_COINJOIN_CLIENT_OPTIONS_H
#endif // BITCOIN_COINJOIN_OPTIONS_H

8
src/coinjoin/coinjoin-server.cpp → src/coinjoin/server.cpp
View File

@ -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>

6
src/coinjoin/coinjoin-server.h → src/coinjoin/server.h
View File

@ -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 @@ public:
void GetJsonInfo(UniValue& obj) const;
};
#endif // BITCOIN_COINJOIN_COINJOIN_SERVER_H
#endif // BITCOIN_COINJOIN_SERVER_H

2
src/coinjoin/coinjoin-util.cpp → src/coinjoin/util.cpp
View File

@ -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>

6
src/coinjoin/coinjoin-util.h → src/coinjoin/util.h
View File

@ -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 @@ private:
int GetSizeOfCompactSizeDiff(size_t nAdd) const;
};
#endif // BITCOIN_COINJOIN_COINJOIN_UTIL_H
#endif // BITCOIN_COINJOIN_UTIL_H

4
src/dsnotificationinterface.cpp
View File

@ -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>

6
src/evo/mnauth.cpp
View File

@ -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>

2
src/governance/governance-classes.cpp → src/governance/classes.cpp
View File

@ -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>

8
src/governance/governance-classes.h → src/governance/classes.h
View File

@ -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 @@ public:
bool IsExpired() const;
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_CLASSES_H
#endif // BITCOIN_GOVERNANCE_CLASSES_H

6
src/governance/governance-exceptions.h → src/governance/exceptions.h
View File

@ -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 @@ public:
}
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_EXCEPTIONS_H
#endif // BITCOIN_GOVERNANCE_EXCEPTIONS_H

8
src/governance/governance.cpp
View File

@ -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>

2
src/governance/governance.h
View File

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

8
src/governance/governance-object.cpp → src/governance/object.cpp
View File

@ -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>

12
src/governance/governance-object.h → src/governance/object.h
View File

@ -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 @@ public:
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_OBJECT_H
#endif // BITCOIN_GOVERNANCE_OBJECT_H

4
src/governance/governance-validators.cpp → src/governance/validators.cpp
View File

@ -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>

6
src/governance/governance-validators.h → src/governance/validators.h
View File

@ -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_VALIDATORS_H
#define BITCOIN_GOVERNANCE_GOVERNANCE_VALIDATORS_H
#ifndef BITCOIN_GOVERNANCE_VALIDATORS_H
#define BITCOIN_GOVERNANCE_VALIDATORS_H
#include <string>
@ -45,4 +45,4 @@ private:
bool CheckURL(const std::string& strURLIn);
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VALIDATORS_H
#endif // BITCOIN_GOVERNANCE_VALIDATORS_H

4
src/governance/governance-vote.cpp → src/governance/vote.cpp
View File

@ -2,11 +2,11 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <governance/governance-vote.h>
#include <governance/vote.h>
#include <bls/bls.h>
#include <key.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <messagesigner.h>
#include <net.h>
#include <util/system.h>

6
src/governance/governance-vote.h → src/governance/vote.h
View File

@ -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_VOTE_H
#define BITCOIN_GOVERNANCE_GOVERNANCE_VOTE_H
#ifndef BITCOIN_GOVERNANCE_VOTE_H
#define BITCOIN_GOVERNANCE_VOTE_H
#include <primitives/transaction.h>
@ -127,4 +127,4 @@ public:
}
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VOTE_H
#endif // BITCOIN_GOVERNANCE_VOTE_H

2
src/governance/governance-votedb.cpp → src/governance/votedb.cpp
View File

@ -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-votedb.h>
#include <governance/votedb.h>
CGovernanceObjectVoteFile::CGovernanceObjectVoteFile() :
nMemoryVotes(0),

8
src/governance/governance-votedb.h → src/governance/votedb.h
View File

@ -2,13 +2,13 @@
// 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_VOTEDB_H
#define BITCOIN_GOVERNANCE_GOVERNANCE_VOTEDB_H
#ifndef BITCOIN_GOVERNANCE_VOTEDB_H
#define BITCOIN_GOVERNANCE_VOTEDB_H
#include <list>
#include <map>
#include <governance/governance-vote.h>
#include <governance/vote.h>
#include <serialize.h>
#include <streams.h>
#include <uint256.h>
@ -78,4 +78,4 @@ private:
void RebuildIndex();
};
#endif // BITCOIN_GOVERNANCE_GOVERNANCE_VOTEDB_H
#endif // BITCOIN_GOVERNANCE_VOTEDB_H

10
src/init.cpp
View File

@ -57,14 +57,14 @@
#include <util/validation.h>
#include <validationinterface.h>
#include <masternode/activemasternode.h>
#include <coinjoin/coinjoin-server.h>
#include <masternode/node.h>
#include <coinjoin/server.h>
#include <dsnotificationinterface.h>
#include <flat-database.h>
#include <governance/governance.h>
#include <masternode/masternode-meta.h>
#include <masternode/masternode-sync.h>
#include <masternode/masternode-utils.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <masternode/utils.h>
#include <messagesigner.h>
#include <netfulfilledman.h>
#include <spork.h>

6
src/interfaces/node.cpp
View File

@ -10,12 +10,12 @@
#include <chain.h>
#include <chainparams.h>
#include <evo/deterministicmns.h>
#include <governance/governance-object.h>
#include <governance/object.h>
#include <init.h>
#include <interfaces/handler.h>
#include <interfaces/wallet.h>
#include <llmq/quorums_instantsend.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <net.h>
#include <net_processing.h>
#include <netaddress.h>
@ -39,7 +39,7 @@
#endif
#include <coinjoin/coinjoin.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/options.h>
#include <atomic>
#include <univalue.h>

2
src/interfaces/wallet.cpp
View File

@ -6,7 +6,7 @@
#include <amount.h>
#include <chain.h>
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/client.h>
#include <consensus/validation.h>
#include <interfaces/handler.h>
#include <net.h>

4
src/llmq/quorums.cpp
View File

@ -12,9 +12,9 @@
#include <evo/specialtx.h>
#include <evo/deterministicmns.h>
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <chainparams.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <net.h>
#include <net_processing.h>
#include <netmessagemaker.h>

2
src/llmq/quorums_chainlocks.cpp
View File

@ -9,7 +9,7 @@
#include <chain.h>
#include <consensus/validation.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <net_processing.h>
#include <scheduler.h>
#include <spork.h>

4
src/llmq/quorums_dkgsession.cpp
View File

@ -11,8 +11,8 @@
#include <evo/deterministicmns.h>
#include <evo/specialtx.h>
#include <masternode/activemasternode.h>
#include <masternode/masternode-meta.h>
#include <masternode/node.h>
#include <masternode/meta.h>
#include <chainparams.h>
#include <netmessagemaker.h>
#include <univalue.h>

2
src/llmq/quorums_dkgsessionhandler.cpp
View File

@ -12,7 +12,7 @@
#include <evo/deterministicmns.h>
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <chainparams.h>
#include <net_processing.h>
#include <spork.h>

2
src/llmq/quorums_instantsend.cpp
View File

@ -13,7 +13,7 @@
#include <consensus/validation.h>
#include <index/txindex.h>
#include <txmempool.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <net_processing.h>
#include <spork.h>
#include <validation.h>

2
src/llmq/quorums_signing.cpp
View File

@ -8,7 +8,7 @@
#include <llmq/quorums_utils.h>
#include <llmq/quorums_signing_shares.h>
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <bls/bls_batchverifier.h>
#include <chainparams.h>
#include <cxxtimer.hpp>

2
src/llmq/quorums_signing_shares.cpp
View File

@ -10,7 +10,7 @@
#include <evo/deterministicmns.h>
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <bls/bls_batchverifier.h>
#include <net_processing.h>
#include <netmessagemaker.h>

2
src/llmq/quorums_utils.cpp
View File

@ -15,7 +15,7 @@
#include <validation.h>
#include <versionbits.h>
#include <masternode/masternode-meta.h>
#include <masternode/meta.h>
namespace llmq
{

2
src/masternode/masternode-meta.cpp → src/masternode/meta.cpp
View File

@ -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 <masternode/masternode-meta.h>
#include <masternode/meta.h>
#include <timedata.h>

6
src/masternode/masternode-meta.h → src/masternode/meta.h
View File

@ -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_MASTERNODE_MASTERNODE_META_H
#define BITCOIN_MASTERNODE_MASTERNODE_META_H
#ifndef BITCOIN_MASTERNODE_META_H
#define BITCOIN_MASTERNODE_META_H
#include <serialize.h>
@ -151,4 +151,4 @@ public:
extern CMasternodeMetaMan mmetaman;
#endif // BITCOIN_MASTERNODE_MASTERNODE_META_H
#endif // BITCOIN_MASTERNODE_META_H

2
src/masternode/activemasternode.cpp → src/masternode/node.cpp
View File

@ -2,7 +2,7 @@
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <evo/deterministicmns.h>

6
src/masternode/activemasternode.h → src/masternode/node.h
View File

@ -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_MASTERNODE_ACTIVEMASTERNODE_H
#define BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
#ifndef BITCOIN_MASTERNODE_NODE_H
#define BITCOIN_MASTERNODE_NODE_H
#include <chainparams.h>
#include <primitives/transaction.h>
@ -62,4 +62,4 @@ private:
bool GetLocalAddress(CService& addrRet);
};
#endif // BITCOIN_MASTERNODE_ACTIVEMASTERNODE_H
#endif // BITCOIN_MASTERNODE_NODE_H

8
src/masternode/masternode-payments.cpp → src/masternode/payments.cpp
View File

@ -4,10 +4,10 @@
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <governance/governance-classes.h>
#include <masternode/activemasternode.h>
#include <masternode/masternode-payments.h>
#include <masternode/masternode-sync.h>
#include <governance/classes.h>
#include <masternode/node.h>
#include <masternode/payments.h>
#include <masternode/sync.h>
#include <netfulfilledman.h>
#include <netmessagemaker.h>
#include <validation.h>

6
src/masternode/masternode-payments.h → src/masternode/payments.h
View File

@ -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_MASTERNODE_MASTERNODE_PAYMENTS_H
#define BITCOIN_MASTERNODE_MASTERNODE_PAYMENTS_H
#ifndef BITCOIN_MASTERNODE_PAYMENTS_H
#define BITCOIN_MASTERNODE_PAYMENTS_H
class CMasternodePayments;
@ -28,4 +28,4 @@ public:
static bool GetMasternodeTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet);
};
#endif // BITCOIN_MASTERNODE_MASTERNODE_PAYMENTS_H
#endif // BITCOIN_MASTERNODE_PAYMENTS_H

2
src/masternode/masternode-sync.cpp → src/masternode/sync.cpp
View File

@ -4,7 +4,7 @@
#include <governance/governance.h>
#include <validation.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <netfulfilledman.h>
#include <netmessagemaker.h>
#include <shutdown.h>

6
src/masternode/masternode-sync.h → src/masternode/sync.h
View File

@ -1,8 +1,8 @@
// 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_MASTERNODE_MASTERNODE_SYNC_H
#define BITCOIN_MASTERNODE_MASTERNODE_SYNC_H
#ifndef BITCOIN_MASTERNODE_SYNC_H
#define BITCOIN_MASTERNODE_SYNC_H
#include <atomic>
@ -74,4 +74,4 @@ public:
void DoMaintenance(CConnman &connman);
};
#endif // BITCOIN_MASTERNODE_MASTERNODE_SYNC_H
#endif // BITCOIN_MASTERNODE_SYNC_H

6
src/masternode/masternode-utils.cpp → src/masternode/utils.cpp
View File

@ -2,13 +2,13 @@
// Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <masternode/masternode-utils.h>
#include <masternode/utils.h>
#include <evo/deterministicmns.h>
#ifdef ENABLE_WALLET
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/client.h>
#endif
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <net.h>
#include <shutdown.h>
#include <validation.h>

6
src/masternode/masternode-utils.h → src/masternode/utils.h
View File

@ -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_MASTERNODE_MASTERNODE_UTILS_H
#define BITCOIN_MASTERNODE_MASTERNODE_UTILS_H
#ifndef BITCOIN_MASTERNODE_UTILS_H
#define BITCOIN_MASTERNODE_UTILS_H
class CConnman;
@ -14,4 +14,4 @@ public:
static void DoMaintenance(CConnman &connman);
};
#endif // BITCOIN_MASTERNODE_MASTERNODE_UTILS_H
#endif // BITCOIN_MASTERNODE_UTILS_H

4
src/miner.cpp
View File

@ -34,8 +34,8 @@
#include <llmq/quorums_blockprocessor.h>
#include <llmq/quorums_chainlocks.h>
#include <llmq/quorums_utils.h>
#include <masternode/masternode-payments.h>
#include <masternode/masternode-sync.h>
#include <masternode/payments.h>
#include <masternode/sync.h>
#include <algorithm>
#include <queue>

4
src/net.cpp
View File

@ -25,8 +25,8 @@
#include <util/strencodings.h>
#include <validation.h>
#include <masternode/masternode-meta.h>
#include <masternode/masternode-sync.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <coinjoin/coinjoin.h>
#include <evo/deterministicmns.h>

10
src/net_processing.cpp
View File

@ -40,13 +40,13 @@
#include <spork.h>
#include <governance/governance.h>
#include <masternode/masternode-payments.h>
#include <masternode/masternode-sync.h>
#include <masternode/masternode-meta.h>
#include <masternode/payments.h>
#include <masternode/sync.h>
#include <masternode/meta.h>
#ifdef ENABLE_WALLET
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/client.h>
#endif // ENABLE_WALLET
#include <coinjoin/coinjoin-server.h>
#include <coinjoin/server.h>
#include <evo/deterministicmns.h>
#include <evo/mnauth.h>

2
src/qt/optionsmodel.cpp
View File

@ -20,7 +20,7 @@
#include <txdb.h> // for -dbcache defaults
#ifdef ENABLE_WALLET
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/options.h>
#endif
#include <QNetworkProxy>

2
src/qt/overviewpage.cpp
View File

@ -15,7 +15,7 @@
#include <qt/utilitydialog.h>
#include <qt/walletmodel.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/options.h>
#include <QAbstractItemDelegate>
#include <QPainter>

2
src/qt/test/wallettests.cpp
View File

@ -1,7 +1,7 @@
#include <qt/test/wallettests.h>
#include <qt/test/util.h>
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/client.h>
#include <interfaces/node.h>
#include <base58.h>
#include <qt/bitcoinamountfield.h>

6
src/rpc/coinjoin.cpp
View File

@ -4,11 +4,11 @@
#include <validation.h>
#ifdef ENABLE_WALLET
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/client.h>
#include <coinjoin/options.h>
#include <wallet/rpcwallet.h>
#endif // ENABLE_WALLET
#include <coinjoin/coinjoin-server.h>
#include <coinjoin/server.h>
#include <rpc/server.h>
#include <util/strencodings.h>

10
src/rpc/governance.cpp
View File

@ -6,13 +6,13 @@
#include <core_io.h>
#include <evo/deterministicmns.h>
#include <governance/governance.h>
#include <governance/governance-vote.h>
#include <governance/governance-classes.h>
#include <governance/governance-validators.h>
#include <governance/vote.h>
#include <governance/classes.h>
#include <governance/validators.h>
#include <index/txindex.h>
#include <txmempool.h>
#include <masternode/activemasternode.h>
#include <masternode/masternode-sync.h>
#include <masternode/node.h>
#include <masternode/sync.h>
#include <messagesigner.h>
#include <net.h>
#include <rpc/server.h>

6
src/rpc/masternode.cpp
View File

@ -3,10 +3,10 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <evo/deterministicmns.h>
#include <governance/governance-classes.h>
#include <governance/classes.h>
#include <index/txindex.h>
#include <masternode/activemasternode.h>
#include <masternode/masternode-payments.h>
#include <masternode/node.h>
#include <masternode/payments.h>
#include <net.h>
#include <netbase.h>
#include <rpc/server.h>

4
src/rpc/mining.cpp
View File

@ -31,9 +31,9 @@
#include <versionbitsinfo.h>
#include <warnings.h>
#include <governance/governance-classes.h>
#include <governance/classes.h>
#include <governance/governance.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <evo/deterministicmns.h>

2
src/rpc/misc.cpp
View File

@ -24,7 +24,7 @@
#include <util/validation.h>
#include <warnings.h>
#include <masternode/masternode-sync.h>
#include <masternode/sync.h>
#include <spork.h>
#include <stdint.h>

2
src/rpc/rpcevo.cpp
View File

@ -28,7 +28,7 @@
#include <bls/bls.h>
#include <masternode/masternode-meta.h>
#include <masternode/meta.h>
#ifdef ENABLE_WALLET
extern UniValue signrawtransaction(const JSONRPCRequest& request);

2
src/rpc/rpcquorums.cpp
View File

@ -7,7 +7,7 @@
#include <rpc/server.h>
#include <validation.h>
#include <masternode/activemasternode.h>
#include <masternode/node.h>
#include <evo/deterministicmns.h>
#include <llmq/quorums.h>

2
src/test/governance_validators_tests.cpp
View File

@ -1,6 +1,6 @@
// Copyright (c) 2014-2020 The Dash Core developers
#include <governance/governance-validators.h>
#include <governance/validators.h>
#include <util/strencodings.h>
#include <test/data/proposals_valid.json.h>

2
src/test/miner_tests.cpp
View File

@ -9,7 +9,7 @@
#include <consensus/tx_verify.h>
#include <consensus/validation.h>
#include <validation.h>
#include <masternode/masternode-payments.h>
#include <masternode/payments.h>
#include <miner.h>
#include <policy/policy.h>
#include <pow.h>

2
src/validation.cpp
View File

@ -45,7 +45,7 @@
#include <versionbitsinfo.h>
#include <warnings.h>
#include <masternode/masternode-payments.h>
#include <masternode/payments.h>
#include <evo/specialtx.h>
#include <evo/deterministicmns.h>

4
src/wallet/init.cpp
View File

@ -16,8 +16,8 @@
#include <wallet/wallet.h>
#include <wallet/walletutil.h>
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/client.h>
#include <coinjoin/options.h>
#include <functional>

4
src/wallet/rpcwallet.cpp
View File

@ -34,8 +34,8 @@
#include <wallet/walletutil.h>
#include <key_io.h>
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/client.h>
#include <coinjoin/options.h>
#include <llmq/quorums_chainlocks.h>
#include <llmq/quorums_instantsend.h>

2
src/wallet/test/coinjoin_tests.cpp
View File

@ -5,7 +5,7 @@
#include <test/test_dash.h>
#include <amount.h>
#include <coinjoin/coinjoin-util.h>
#include <coinjoin/util.h>
#include <coinjoin/coinjoin.h>
#include <consensus/validation.h>
#include <validation.h>

4
src/wallet/wallet.cpp
View File

@ -32,8 +32,8 @@
#include <wallet/fees.h>
#include <warnings.h>
#include <coinjoin/coinjoin-client.h>
#include <coinjoin/coinjoin-client-options.h>
#include <coinjoin/client.h>
#include <coinjoin/options.h>
#include <governance/governance.h>
#include <evo/deterministicmns.h>
#include <keepass.h>

2
src/wallet/wallet.h
View File

@ -23,7 +23,7 @@
#include <wallet/walletdb.h>
#include <wallet/walletutil.h>
#include <governance/governance-object.h>
#include <governance/object.h>
#include <algorithm>
#include <atomic>

2
src/wallet/walletdb.cpp
View File

@ -10,7 +10,7 @@
#include <consensus/validation.h>
#include <key_io.h>
#include <fs.h>
#include <governance/governance-object.h>
#include <governance/object.h>
#include <protocol.h>
#include <serialize.h>
#include <sync.h>

4
src/zmq/zmqpublishnotifier.cpp
View File

@ -12,8 +12,8 @@
#include <validation.h>
#include <zmq/zmqutil.h>
#include <governance/governance-object.h>
#include <governance/governance-vote.h>
#include <governance/object.h>
#include <governance/vote.h>
#include <llmq/quorums_chainlocks.h>
#include <llmq/quorums_instantsend.h>

29
test/lint/lint-circular-dependencies.sh
View File

@ -36,7 +36,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/signverifymessagedialog -> qt/addressbookpage"
"qt/addressbookpage -> qt/bitcoingui -> qt/walletview -> qt/sendcoinsdialog -> qt/sendcoinsentry -> qt/addressbookpage"
# Dash
"coinjoin/coinjoin-server -> net_processing -> coinjoin/coinjoin-server"
"coinjoin/server -> net_processing -> coinjoin/server"
"evo/cbtx -> evo/simplifiedmns -> evo/cbtx"
"evo/cbtx -> evo/specialtx -> evo/cbtx"
"evo/deterministicmns -> evo/providertx -> evo/deterministicmns"
@ -49,11 +49,12 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"evo/specialtx -> llmq/quorums_blockprocessor -> evo/specialtx"
"evo/specialtx -> llmq/quorums_commitment -> evo/specialtx"
"evo/specialtx -> validation -> evo/specialtx"
"governance/governance -> governance/governance-classes -> governance/governance"
"governance/governance -> governance/governance-object -> governance/governance"
"governance/governance -> masternode/masternode-sync -> governance/governance"
"governance/classes -> governance/governance -> governance/classes"
"governance/classes -> governance/governance -> net_processing -> masternode/payments -> governance/classes"
"governance/governance -> governance/object -> governance/governance"
"governance/governance -> masternode/sync -> governance/governance"
"governance/governance -> net_processing -> governance/governance"
"governance/governance-object -> governance/governance-validators -> governance/governance-object"
"governance/object -> governance/validators -> governance/object"
"llmq/quorums -> llmq/quorums_utils -> llmq/quorums"
"llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_blockprocessor"
"llmq/quorums_chainlocks -> llmq/quorums_instantsend -> llmq/quorums_chainlocks"
@ -66,7 +67,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"llmq/quorums_signing -> net_processing -> llmq/quorums_signing"
"llmq/quorums_signing_shares -> net_processing -> llmq/quorums_signing_shares"
"logging -> util/system -> logging"
"masternode/masternode-payments -> validation -> masternode/masternode-payments"
"masternode/payments -> validation -> masternode/payments"
"net -> netmessagemaker -> net"
"net_processing -> spork -> net_processing"
"netaddress -> netbase -> netaddress"
@ -82,7 +83,7 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"logging -> util/system -> random -> logging"
"logging -> util/system -> sync -> logging"
"logging -> util/system -> stacktraces -> logging"
"coinjoin/coinjoin-client -> coinjoin/coinjoin-util -> wallet/wallet -> coinjoin/coinjoin-client"
"coinjoin/client -> coinjoin/util -> wallet/wallet -> coinjoin/client"
"qt/appearancewidget -> qt/guiutil -> qt/optionsdialog -> qt/appearancewidget"
"qt/bitcoinaddressvalidator -> qt/guiutil -> qt/qvalidatedlineedit -> qt/bitcoinaddressvalidator"
"qt/guiutil -> qt/optionsdialog -> qt/optionsmodel -> qt/guiutil"
@ -93,22 +94,18 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/specialtx"
"evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
"coinjoin/coinjoin-client -> net_processing -> coinjoin/coinjoin-client"
"coinjoin/client -> net_processing -> coinjoin/client"
"llmq/quorums -> net_processing -> llmq/quorums"
"llmq/quorums_commitment -> llmq/quorums_utils -> llmq/quorums_commitment"
"llmq/quorums_dkgsession -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsession"
"evo/deterministicmns -> validationinterface -> txmempool -> evo/deterministicmns"
"llmq/quorums -> validation -> llmq/quorums_chainlocks -> llmq/quorums"
"llmq/quorums_chainlocks -> llmq/quorums_instantsend -> validation -> llmq/quorums_chainlocks"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> evo/deterministicmns"
"core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> core_io"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> masternode/activemasternode -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> masternode/masternode-sync -> evo/deterministicmns"
"governance/governance -> net_processing -> masternode/masternode-payments -> governance/governance"
"core_io -> evo/cbtx -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> core_io"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/payments -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/payments -> masternode/node -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> masternode/sync -> evo/deterministicmns"
"governance/governance -> net_processing -> masternode/payments -> governance/governance"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net -> evo/deterministicmns"
"evo/deterministicmns -> evo/simplifiedmns -> llmq/quorums_blockprocessor -> net_processing -> masternode/masternode-payments -> governance/governance-classes -> governance/governance-object -> governance/governance-vote -> evo/deterministicmns"
"coinjoin/coinjoin -> llmq/quorums_chainlocks -> net -> coinjoin/coinjoin"
)