Skip to content

refactor: remove dead m_dsq client-side relay from MessageProcessingResult #7229

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 1 commit into from
Mar 16, 2026
Merged

refactor: remove dead m_dsq client-side relay from MessageProcessingResult #7229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/coinjoin/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ MessageProcessingResult CCoinJoinClientQueueManager::ProcessMessage(NodeId from,
WITH_LOCK(cs_vecqueue, vecCoinJoinQueue.push_back(dsq));
}
} // cs_ProcessDSQueue
ret.m_dsq.push_back(dsq);
return ret;
}

Expand Down
2 changes: 2 additions & 0 deletions src/instantsend/net_instantsend.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
#include <thread>
#include <vector>

class CChainState;

namespace Consensus {
struct LLMQParams;
} // namespace Consensus
Expand Down
1 change: 1 addition & 0 deletions src/instantsend/signing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <instantsend/lock.h>
#include <llmq/signing.h>
#include <primitives/transaction.h>

#include <optional>

Expand Down
7 changes: 1 addition & 6 deletions src/msg_result.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@
#ifndef BITCOIN_MSG_RESULT_H
#define BITCOIN_MSG_RESULT_H

#include <coinjoin/coinjoin.h>

#include <protocol.h>
#include <uint256.h>

Expand Down Expand Up @@ -50,9 +48,6 @@ struct MessageProcessingResult
//! @m_inventory will relay these inventories to connected peers
std::vector<CInv> m_inventory;

//! @m_dsq will relay DSQs to connected peers
std::vector<CCoinJoinQueue> m_dsq;

//! @m_transactions will relay transactions to peers which is ready to accept it (some peers does not accept transactions)
std::vector<uint256> m_transactions;

Expand All @@ -68,7 +63,7 @@ struct MessageProcessingResult
m_error(error)
{}

bool empty() const { return !m_error.has_value() && m_inventory.empty() && m_dsq.empty() && m_transactions.empty() && !m_to_erase.has_value(); }
bool empty() const { return !m_error.has_value() && m_inventory.empty() && m_transactions.empty() && !m_to_erase.has_value(); }
};

#endif // BITCOIN_MSG_RESULT_H
1 change: 1 addition & 0 deletions src/rpc/quorums.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <util/helpers.h>

#include <chainparams.h>
#include <core_io.h>
#include <deploymentstatus.h>
#include <index/txindex.h>
#include <net_processing.h>
Expand Down
2 changes: 0 additions & 2 deletions test/lint/lint-circular-dependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
# Dash
"active/context -> active/dkgsessionhandler -> llmq/dkgsessionhandler -> net_processing -> active/context",
"banman -> common/bloom -> evo/assetlocktx -> llmq/quorumsman -> net -> banman",
"chainlock/chainlock -> spork -> msg_result -> coinjoin/coinjoin -> chainlock/chainlock",
"chainlock/chainlock -> spork -> net -> evo/deterministicmns -> evo/providertx -> validation -> chainlock/chainlock",
"coinjoin/coinjoin -> instantsend/instantsend -> spork -> msg_result -> coinjoin/coinjoin",
"coinjoin/client -> coinjoin/util -> wallet/wallet -> psbt -> node/transaction -> net_processing -> coinjoin/walletman -> coinjoin/client",
"common/bloom -> evo/assetlocktx -> llmq/commitment -> evo/deterministicmns -> evo/simplifiedmns -> merkleblock -> common/bloom",
"common/bloom -> evo/assetlocktx -> llmq/quorumsman -> net -> common/bloom",
Expand Down
Loading