refactor: llmq pretty trivial refactor circular dependancy (#4065)

* move DEFAULT_WATCH_QUORUMS to quorums.h

Signed-off-by: pasta <pasta@dashboost.org>

* resolve circular lint, -10, +4
This commit is contained in:
PastaPastaPasta 2021-03-26 08:21:41 -04:00 committed by GitHub
parent 0ad22e1f00
commit f492291aca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 9 additions and 16 deletions

View File

@ -6,7 +6,6 @@
#include <llmq/quorums_blockprocessor.h>
#include <llmq/quorums_dkgsession.h>
#include <llmq/quorums_dkgsessionmgr.h>
#include <llmq/quorums_init.h>
#include <llmq/quorums_utils.h>
#include <evo/specialtx.h>

View File

@ -22,6 +22,9 @@
namespace llmq
{
// If true, we will connect to all new quorums and watch their communication
static const bool DEFAULT_WATCH_QUORUMS = false;
class CDKGSessionManager;
/**

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.
#include <llmq/quorums.h>
#include <llmq/quorums_dkgsessionhandler.h>
#include <llmq/quorums_blockprocessor.h>
#include <llmq/quorums_debug.h>
#include <llmq/quorums_init.h>
#include <llmq/quorums_utils.h>
#include <masternode/activemasternode.h>

View File

@ -11,9 +11,6 @@ class CEvoDB;
namespace llmq
{
// If true, we will connect to all new quorums and watch their communication
static const bool DEFAULT_WATCH_QUORUMS = false;
// Init/destroy LLMQ globals
void InitLLMQSystem(CEvoDB& evoDb, bool unitTests, bool fWipe = false);
void DestroyLLMQSystem();

View File

@ -49,7 +49,6 @@
#include <llmq/quorums_commitment.h>
#include <llmq/quorums_chainlocks.h>
#include <llmq/quorums_dkgsessionmgr.h>
#include <llmq/quorums_init.h>
#include <llmq/quorums_instantsend.h>
#include <llmq/quorums_signing.h>
#include <llmq/quorums_signing_shares.h>

View File

@ -74,7 +74,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"init -> txdb -> init"
"init -> validation -> init"
"init -> validationinterface -> init"
"llmq/quorums -> llmq/quorums_init -> llmq/quorums"
"llmq/quorums -> llmq/quorums_utils -> llmq/quorums"
"llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_blockprocessor"
"llmq/quorums_chainlocks -> llmq/quorums_instantsend -> llmq/quorums_chainlocks"
@ -112,18 +111,9 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"httprpc -> httpserver -> init -> httprpc"
"httpserver -> init -> httpserver"
"init -> llmq/quorums_init -> llmq/quorums_signing_shares -> init"
"init -> llmq/quorums_signing -> llmq/quorums -> init"
"llmq/quorums -> llmq/quorums_init -> llmq/quorums_chainlocks -> llmq/quorums"
"llmq/quorums -> llmq/quorums_init -> llmq/quorums_signing -> llmq/quorums"
"llmq/quorums -> llmq/quorums_init -> llmq/quorums_signing_shares -> llmq/quorums"
"llmq/quorums_blockprocessor -> net_processing -> llmq/quorums_init -> llmq/quorums_blockprocessor"
"llmq/quorums_chainlocks -> net_processing -> llmq/quorums_init -> llmq/quorums_chainlocks"
"llmq/quorums_chainlocks -> net_processing -> validationinterface -> llmq/quorums_chainlocks"
"llmq/quorums_chainlocks -> llmq/quorums_instantsend -> wallet/wallet -> llmq/quorums_chainlocks"
"llmq/quorums_dkgsession -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler -> llmq/quorums_dkgsession"
"llmq/quorums_dkgsessionhandler -> llmq/quorums_init -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler"
"llmq/quorums_dkgsessionmgr -> net_processing -> llmq/quorums_init -> llmq/quorums_dkgsessionmgr"
"llmq/quorums_init -> llmq/quorums_instantsend -> net_processing -> llmq/quorums_init"
"llmq/quorums_instantsend -> net_processing -> validationinterface -> llmq/quorums_instantsend"
"logging -> util -> random -> logging"
"logging -> util -> sync -> logging"
@ -142,6 +132,11 @@ EXPECTED_CIRCULAR_DEPENDENCIES=(
"init -> llmq/quorums_init -> llmq/quorums_instantsend -> wallet/wallet -> init"
"evo/providertx -> evo/specialtx -> llmq/quorums_blockprocessor -> net_processing -> txmempool -> evo/providertx"
"governance/governance -> init -> llmq/quorums_init -> llmq/quorums_instantsend -> wallet/wallet -> governance/governance"
"init -> llmq/quorums_init -> llmq/quorums -> init"
"llmq/quorums -> validationinterface -> llmq/quorums_chainlocks -> llmq/quorums"
"llmq/quorums -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler -> llmq/quorums"
"init -> llmq/quorums_init -> llmq/quorums_dkgsessionmgr -> llmq/quorums_dkgsessionhandler -> init"
)
EXIT_CODE=0