Skip to content

Commit 8c3ff61

Browse files
kwvgkwvg
committed
chore: apply some clang-format-diff.py suggestions
1 parent aa1f56f commit 8c3ff61

File tree

7 files changed

+47
-31
lines changed

7 files changed

+47
-31
lines changed

‎src/coinjoin/client.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,8 @@ bool CCoinJoinClientManager::CheckAutomaticBackup()
793793
//
794794
// Passively run mixing in the background to mix funds based on the given configuration.
795795
//
796-
bool CCoinJoinClientSession::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool, bool fDryRun)
796+
bool CCoinJoinClientSession::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman,
797+
const CTxMemPool& mempool, bool fDryRun)
797798
{
798799
if (m_is_masternode) return false; // no client-side mixing on masternodes
799800
if (nState != POOL_STATE_IDLE) return false;
@@ -973,7 +974,8 @@ bool CCoinJoinClientSession::DoAutomaticDenominating(ChainstateManager& chainman
973974
return false;
974975
}
975976

976-
bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool, bool fDryRun)
977+
bool CCoinJoinClientManager::DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman,
978+
const CTxMemPool& mempool, bool fDryRun)
977979
{
978980
if (m_is_masternode) return false; // no client-side mixing on masternodes
979981
if (!CCoinJoinClientOptions::IsEnabled() || !IsMixing()) return false;

‎src/coinjoin/client.h‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,17 @@ class CoinJoinWalletManager {
7575
using wallet_name_cjman_map = std::map<const std::string, std::unique_ptr<CCoinJoinClientManager>>;
7676

7777
public:
78-
CoinJoinWalletManager(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman, CMasternodeMetaMan& mn_metaman, const CTxMemPool& mempool,
79-
const CMasternodeSync& mn_sync, const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode)
80-
: m_chainman(chainman), m_connman(connman), m_dmnman(dmnman), m_mn_metaman(mn_metaman), m_mempool(mempool), m_mn_sync(mn_sync),
81-
m_queueman(queueman), m_is_masternode{is_masternode}
78+
CoinJoinWalletManager(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
79+
CMasternodeMetaMan& mn_metaman, const CTxMemPool& mempool, const CMasternodeSync& mn_sync,
80+
const std::unique_ptr<CCoinJoinClientQueueManager>& queueman, bool is_masternode) :
81+
m_chainman(chainman),
82+
m_connman(connman),
83+
m_dmnman(dmnman),
84+
m_mn_metaman(mn_metaman),
85+
m_mempool(mempool),
86+
m_mn_sync(mn_sync),
87+
m_queueman(queueman),
88+
m_is_masternode{is_masternode}
8289
{}
8390

8491
~CoinJoinWalletManager() {
@@ -203,7 +210,8 @@ class CCoinJoinClientSession : public CCoinJoinBaseSession
203210
bool GetMixingMasternodeInfo(CDeterministicMNCPtr& ret) const;
204211

205212
/// Passively run mixing in the background according to the configuration in settings
206-
bool DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool, bool fDryRun = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_coinjoin);
213+
bool DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool,
214+
bool fDryRun = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_coinjoin);
207215

208216
/// As a client, submit part of a future mixing transaction to a Masternode to start the process
209217
bool SubmitDenominate(CConnman& connman);
@@ -311,7 +319,8 @@ class CCoinJoinClientManager
311319
bool GetMixingMasternodesInfo(std::vector<CDeterministicMNCPtr>& vecDmnsRet) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
312320

313321
/// Passively run mixing in the background according to the configuration in settings
314-
bool DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool, bool fDryRun = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
322+
bool DoAutomaticDenominating(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool,
323+
bool fDryRun = false) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
315324

316325
bool TrySubmitDenominate(const CService& mnAddr, CConnman& connman) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
317326
bool MarkAlreadyJoinedQueueAsTried(CCoinJoinQueue& dsq) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
@@ -327,7 +336,8 @@ class CCoinJoinClientManager
327336

328337
void UpdatedBlockTip(const CBlockIndex* pindex);
329338

330-
void DoMaintenance(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool) EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
339+
void DoMaintenance(ChainstateManager& chainman, CConnman& connman, const CTxMemPool& mempool)
340+
EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
331341

332342
void GetJsonInfo(UniValue& obj) const EXCLUSIVE_LOCKS_REQUIRED(!cs_deqsessions);
333343
};

‎src/coinjoin/coinjoin.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,8 @@ bool CCoinJoinBaseSession::IsValidInOuts(CChainState& active_chainstate, const C
308308

309309
// Responsibility for checking fee sanity is moved from the mempool to the client (BroadcastTransaction)
310310
// but CoinJoin still requires ATMP with fee sanity checks so we need to implement them separately
311-
bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef &tx, bool test_accept) {
311+
bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef& tx, bool test_accept)
312+
{
312313
AssertLockHeld(cs_main);
313314

314315
const MempoolAcceptResult result = chainman.ProcessTransaction(tx, /*test_accept=*/true);

‎src/coinjoin/coinjoin.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,6 @@ namespace CoinJoin
370370

371371
/// If the collateral is valid given by a client
372372
bool IsCollateralValid(ChainstateManager& chainman, const CTxMemPool& mempool, const CTransaction& txCollateral);
373-
374373
}
375374

376375
class CDSTXManager
@@ -403,6 +402,7 @@ class CDSTXManager
403402

404403
};
405404

406-
bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef &tx, bool test_accept = false) EXCLUSIVE_LOCKS_REQUIRED(cs_main);
405+
bool ATMPIfSaneFee(ChainstateManager& chainman, const CTransactionRef& tx, bool test_accept = false)
406+
EXCLUSIVE_LOCKS_REQUIRED(cs_main);
407407

408408
#endif // BITCOIN_COINJOIN_COINJOIN_H

‎src/coinjoin/context.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ CJContext::CJContext(ChainstateManager& chainman, CConnman& connman, CDeterminis
1515
std::unique_ptr<PeerManager>& peerman, bool relay_txes) :
1616
dstxman{std::make_unique<CDSTXManager>()},
1717
#ifdef ENABLE_WALLET
18-
walletman{std::make_unique<CoinJoinWalletManager>(chainman, connman, dmnman, mn_metaman, mempool, mn_sync,
19-
queueman, /* is_masternode = */ mn_activeman != nullptr)},
18+
walletman{std::make_unique<CoinJoinWalletManager>(chainman, connman, dmnman, mn_metaman, mempool, mn_sync, queueman,
19+
/* is_masternode = */ mn_activeman != nullptr)},
2020
queueman{relay_txes
2121
? std::make_unique<CCoinJoinClientQueueManager>(connman, peerman, *walletman, dmnman, mn_metaman,
2222
mn_sync, /* is_masternode = */ mn_activeman != nullptr)

‎src/llmq/context.cpp‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,41 @@
1818
#include <llmq/signing.h>
1919
#include <llmq/signing_shares.h>
2020

21-
LLMQContext::LLMQContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman, CEvoDB& evo_db,
22-
CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
21+
LLMQContext::LLMQContext(ChainstateManager& chainman, CConnman& connman, CDeterministicMNManager& dmnman,
22+
CEvoDB& evo_db, CMasternodeMetaMan& mn_metaman, CMNHFManager& mnhfman, CSporkManager& sporkman,
2323
CTxMemPool& mempool, const CActiveMasternodeManager* const mn_activeman,
2424
const CMasternodeSync& mn_sync, const std::unique_ptr<PeerManager>& peerman, bool unit_tests,
2525
bool wipe) :
2626
is_masternode{mn_activeman != nullptr},
2727
bls_worker{std::make_shared<CBLSWorker>()},
2828
dkg_debugman{std::make_unique<llmq::CDKGDebugManager>()},
2929
quorum_block_processor{std::make_unique<llmq::CQuorumBlockProcessor>(chainman.ActiveChainstate(), dmnman, evo_db)},
30-
qdkgsman{std::make_unique<llmq::CDKGSessionManager>(*bls_worker, chainman.ActiveChainstate(), connman, dmnman, *dkg_debugman,
31-
mn_metaman, *quorum_block_processor, mn_activeman, sporkman,
32-
peerman, unit_tests, wipe)},
33-
qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), connman, dmnman, *qdkgsman, evo_db,
34-
*quorum_block_processor, mn_activeman, mn_sync, sporkman, unit_tests,
35-
wipe)},
36-
sigman{std::make_unique<llmq::CSigningManager>(connman, mn_activeman, chainman.ActiveChainstate(), *qman, peerman, unit_tests, wipe)},
30+
qdkgsman{std::make_unique<llmq::CDKGSessionManager>(*bls_worker, chainman.ActiveChainstate(), connman, dmnman,
31+
*dkg_debugman, mn_metaman, *quorum_block_processor,
32+
mn_activeman, sporkman, peerman, unit_tests, wipe)},
33+
qman{std::make_unique<llmq::CQuorumManager>(*bls_worker, chainman.ActiveChainstate(), connman, dmnman, *qdkgsman,
34+
evo_db, *quorum_block_processor, mn_activeman, mn_sync, sporkman,
35+
unit_tests, wipe)},
36+
sigman{std::make_unique<llmq::CSigningManager>(connman, mn_activeman, chainman.ActiveChainstate(), *qman, peerman,
37+
unit_tests, wipe)},
3738
shareman{std::make_unique<llmq::CSigSharesManager>(connman, *sigman, mn_activeman, *qman, sporkman, peerman)},
3839
clhandler{[&]() -> llmq::CChainLocksHandler* const {
3940
assert(llmq::chainLocksHandler == nullptr);
40-
llmq::chainLocksHandler = std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman, *sigman, *shareman,
41-
sporkman, mempool, mn_sync, is_masternode);
41+
llmq::chainLocksHandler = std::make_unique<llmq::CChainLocksHandler>(chainman.ActiveChainstate(), *qman,
42+
*sigman, *shareman, sporkman, mempool,
43+
mn_sync, is_masternode);
4244
return llmq::chainLocksHandler.get();
4345
}()},
4446
isman{[&]() -> llmq::CInstantSendManager* const {
4547
assert(llmq::quorumInstantSendManager == nullptr);
46-
llmq::quorumInstantSendManager = std::make_unique<llmq::CInstantSendManager>(
47-
*llmq::chainLocksHandler, chainman.ActiveChainstate(), connman, *qman, *sigman, *shareman, sporkman,
48-
mempool, mn_sync, peerman, is_masternode, unit_tests, wipe);
48+
llmq::quorumInstantSendManager = std::make_unique<llmq::CInstantSendManager>(*llmq::chainLocksHandler,
49+
chainman.ActiveChainstate(),
50+
connman, *qman, *sigman, *shareman,
51+
sporkman, mempool, mn_sync, peerman,
52+
is_masternode, unit_tests, wipe);
4953
return llmq::quorumInstantSendManager.get();
5054
}()},
51-
ehfSignalsHandler{
52-
std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *sigman, *shareman, *qman)}
55+
ehfSignalsHandler{std::make_unique<llmq::CEHFSignalsHandler>(chainman, mnhfman, *sigman, *shareman, *qman)}
5356
{
5457
}
5558

‎src/rpc/governance.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
#include <masternode/node.h>
1515
#include <masternode/sync.h>
1616
#include <messagesigner.h>
17-
#include <node/context.h>
1817
#include <net.h>
18+
#include <node/context.h>
1919
#include <rpc/blockchain.h>
2020
#include <rpc/server.h>
2121
#include <rpc/server_util.h>

0 commit comments

Comments
 (0)