Skip to content

refactor: drop dependency of CGovernanceManager on CNetFulfilledRequestManager #7105

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
Jan 15, 2026
Merged

refactor: drop dependency of CGovernanceManager on CNetFulfilledRequestManager #7105

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
13 changes: 1 addition & 12 deletions src/governance/governance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#include <governance/validators.h>
#include <masternode/meta.h>
#include <masternode/sync.h>
#include <netfulfilledman.h>
#include <netmessagemaker.h>
#include <protocol.h>
#include <shutdown.h>
Expand Down Expand Up @@ -63,12 +62,11 @@ GovernanceStore::GovernanceStore() :
{
}

CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfilledRequestManager& netfulfilledman,
CGovernanceManager::CGovernanceManager(CMasternodeMetaMan& mn_metaman,
const ChainstateManager& chainman,
const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync) :
m_db{std::make_unique<db_type>("governance.dat", "magicGovernanceCache")},
m_mn_metaman{mn_metaman},
m_netfulfilledman{netfulfilledman},
m_chainman{chainman},
m_dmnman{dmnman},
m_mn_sync{mn_sync},
Expand Down Expand Up @@ -649,18 +647,9 @@ MessageProcessingResult CGovernanceManager::SyncSingleObjVotes(CNode& peer, cons
MessageProcessingResult CGovernanceManager::SyncObjects(CNode& peer, CConnman& connman) const
{
LOCK(cs_store);
assert(m_netfulfilledman.IsValid());

// do not provide any data until our node is synced
if (!m_mn_sync.IsSynced()) return {};

if (m_netfulfilledman.HasFulfilledRequest(peer.addr, NetMsgType::MNGOVERNANCESYNC)) {
// Asking for the whole list multiple times in a short period of time is no good
LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- peer already asked me for the list\n", __func__);
return MisbehavingError{20};
}
m_netfulfilledman.AddFulfilledRequest(peer.addr, NetMsgType::MNGOVERNANCESYNC);

// SYNC GOVERNANCE OBJECTS WITH OTHER CLIENT

LogPrint(BCLog::GOBJECT, "CGovernanceManager::%s -- syncing all objects to peer=%d\n", __func__, peer.GetId());
Expand Down
4 changes: 1 addition & 3 deletions src/governance/governance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ class CGovernanceObject;
class CGovernanceVote;
class CMasternodeMetaMan;
class CMasternodeSync;
class CNetFulfilledRequestManager;
class CSporkManager;
class CSuperblock;

Expand Down Expand Up @@ -252,7 +251,6 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
bool is_valid{false};

CMasternodeMetaMan& m_mn_metaman;
CNetFulfilledRequestManager& m_netfulfilledman;
const ChainstateManager& m_chainman;
const std::unique_ptr<CDeterministicMNManager>& m_dmnman;
CMasternodeSync& m_mn_sync;
Expand All @@ -274,7 +272,7 @@ class CGovernanceManager : public GovernanceStore, public GovernanceSignerParent
CGovernanceManager() = delete;
CGovernanceManager(const CGovernanceManager&) = delete;
CGovernanceManager& operator=(const CGovernanceManager&) = delete;
explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman, CNetFulfilledRequestManager& netfulfilledman,
explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
const ChainstateManager& chainman,
const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
~CGovernanceManager();
Comment on lines +275 to 278
Copy link

@coderabbitai coderabbitai bot Jan 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

Clang-format CI is failing for this constructor declaration (and it’s the only changed hunk here).
The signature change aligns with the refactor goal; please run clang-format (CI currently fails) and ensure the declaration matches the definition in src/governance/governance.cpp.

Proposed formatting-only tweak (likely what clang-format wants) 
-    explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
-                                const ChainstateManager& chainman,
-                                const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
+    explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
+                                const ChainstateManager& chainman,
+                                const std::unique_ptr<CDeterministicMNManager>& dmnman,
+                                CMasternodeSync& mn_sync);
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
const ChainstateManager& chainman,
const std::unique_ptr<CDeterministicMNManager>& dmnman, CMasternodeSync& mn_sync);
~CGovernanceManager();
explicit CGovernanceManager(CMasternodeMetaMan& mn_metaman,
const ChainstateManager& chainman,
const std::unique_ptr<CDeterministicMNManager>& dmnman,
CMasternodeSync& mn_sync);
~CGovernanceManager();
🤖 Prompt for AI Agents 
In `@src/governance/governance.h` around lines 275 - 278, The constructor
declaration for CGovernanceManager (and its destructor) is misformatted relative
to clang-format and must match the definition in src/governance/governance.cpp;
run clang-format on src/governance/governance.h (and/or apply the same line
breaks/spacing used in the cpp definition) so the signature for explicit
CGovernanceManager(CMasternodeMetaMan& mn_metaman, const ChainstateManager&
chainman, const std::unique_ptr<CDeterministicMNManager>& dmnman,
CMasternodeSync& mn_sync); and ~CGovernanceManager(); exactly mirror the
formatting in the implementation, fixing spacing/line breaks to satisfy CI.

Expand Down
11 changes: 10 additions & 1 deletion src/governance/net_governance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <logging.h>
#include <masternode/sync.h>
#include <net.h>
#include <netfulfilledman.h>
#include <scheduler.h>

class CConnman;
Expand Down Expand Up @@ -61,7 +62,15 @@ void NetGovernance::ProcessMessage(CNode& peer, const std::string& msg_type, CDa

LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- syncing governance objects to our peer %s\n", peer.GetLogString());
if (nProp == uint256()) {
m_peer_manager->PeerPostProcessMessage(m_gov_manager.SyncObjects(peer, m_connman));
assert(m_netfulfilledman.IsValid());
if (!m_netfulfilledman.HasFulfilledRequest(peer.addr, NetMsgType::MNGOVERNANCESYNC)) {
m_netfulfilledman.AddFulfilledRequest(peer.addr, NetMsgType::MNGOVERNANCESYNC);
m_peer_manager->PeerPostProcessMessage(m_gov_manager.SyncObjects(peer, m_connman));
} else {
// Asking for the whole list multiple times in a short period of time is no good
LogPrint(BCLog::GOBJECT, "MNGOVERNANCESYNC -- peer already asked me for the list\n");
m_peer_manager->PeerMisbehaving(peer.GetId(), 20);
}
} else {
m_peer_manager->PeerPostProcessMessage(m_gov_manager.SyncSingleObjVotes(peer, nProp, filter, m_connman));
}
Expand Down
5 changes: 4 additions & 1 deletion src/governance/net_governance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,17 @@

class CGovernanceManager;
class CMasternodeSync;
class CNetFulfilledRequestManager;

class NetGovernance final : public NetHandler
{
public:
NetGovernance(PeerManagerInternal* peer_manager, CGovernanceManager& gov_manager, CMasternodeSync& node_sync,
NetGovernance(PeerManagerInternal* peer_manager, CGovernanceManager& gov_manager, CMasternodeSync& node_sync, CNetFulfilledRequestManager& netfulfilledman,
CConnman& connman) :
NetHandler(peer_manager),
m_gov_manager(gov_manager),
m_node_sync(node_sync),
m_netfulfilledman(netfulfilledman),
m_connman(connman)
{
}
Expand All @@ -28,6 +30,7 @@ class NetGovernance final : public NetHandler
private:
CGovernanceManager& m_gov_manager;
CMasternodeSync& m_node_sync;
CNetFulfilledRequestManager& m_netfulfilledman;
CConnman& m_connman;
};

Expand Down
4 changes: 2 additions & 2 deletions src/init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1983,7 +1983,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
*/
node.mn_sync = std::make_unique<CMasternodeSync>(std::make_unique<NodeSyncNotifierImpl>(*node.connman, *node.netfulfilledman));

node.govman = std::make_unique<CGovernanceManager>(*node.mn_metaman, *node.netfulfilledman, *node.chainman, node.dmnman, *node.mn_sync);
node.govman = std::make_unique<CGovernanceManager>(*node.mn_metaman, *node.chainman, node.dmnman, *node.mn_sync);

const bool fReset = fReindex;
bilingual_str strLoadError;
Expand Down Expand Up @@ -2259,7 +2259,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
}
return InitError(strprintf(_("Failed to clear governance cache at %s"), file_path));
}
node.peerman->AddExtraHandler(std::make_unique<NetGovernance>(node.peerman.get(), *node.govman, *node.mn_sync, *node.connman));
node.peerman->AddExtraHandler(std::make_unique<NetGovernance>(node.peerman.get(), *node.govman, *node.mn_sync, *node.netfulfilledman, *node.connman));
}
node.peerman->AddExtraHandler(std::make_unique<SyncManager>(node.peerman.get(), *node.govman, *node.mn_sync, *node.connman, *node.netfulfilledman));

Expand Down
2 changes: 1 addition & 1 deletion src/test/util/setup_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve

m_node.mnhf_manager = std::make_unique<CMNHFManager>(*m_node.evodb, *m_node.chainman);
m_node.mn_sync = std::make_unique<CMasternodeSync>(std::make_unique<NodeSyncNotifierImpl>(*m_node.connman, *m_node.netfulfilledman));
m_node.govman = std::make_unique<CGovernanceManager>(*m_node.mn_metaman, *m_node.netfulfilledman, *m_node.chainman, m_node.dmnman, *m_node.mn_sync);
m_node.govman = std::make_unique<CGovernanceManager>(*m_node.mn_metaman, *m_node.chainman, m_node.dmnman, *m_node.mn_sync);

// Start script-checking threads. Set g_parallel_script_checks to true so they are used.
constexpr int script_check_threads = 2;
Expand Down
Loading