refactor: De-globalize g_signals

This commit is contained in:
TheCharlatan
2024-01-18 20:23:48 +01:00
parent 473dd4b97a
commit 84f5c135b8
30 changed files with 131 additions and 154 deletions

View File

@@ -94,8 +94,6 @@ public:
}
};
static CMainSignals g_signals;
CMainSignals::CMainSignals() {}
CMainSignals::~CMainSignals() {}
@@ -124,11 +122,6 @@ size_t CMainSignals::CallbacksPending()
return m_internals->m_schedulerClient.CallbacksPending();
}
CMainSignals& GetMainSignals()
{
return g_signals;
}
void CMainSignals::RegisterSharedValidationInterface(std::shared_ptr<CValidationInterface> callbacks)
{
// Each connection captures the shared_ptr to ensure that each callback is
@@ -277,33 +270,3 @@ void CMainSignals::NewPoWValidBlock(const CBlockIndex *pindex, const std::shared
LOG_EVENT("%s: block hash=%s", __func__, block->GetHash().ToString());
m_internals->Iterate([&](CValidationInterface& callbacks) { callbacks.NewPoWValidBlock(pindex, block); });
}
// These functions are temporary and will be removed in the following commit
void RegisterValidationInterface(CValidationInterface* callbacks)
{
GetMainSignals().RegisterValidationInterface(callbacks);
}
void UnregisterValidationInterface(CValidationInterface* callbacks)
{
GetMainSignals().UnregisterValidationInterface(callbacks);
}
void UnregisterAllValidationInterfaces()
{
GetMainSignals().UnregisterAllValidationInterfaces();
}
void RegisterSharedValidationInterface(std::shared_ptr<CValidationInterface> callbacks)
{
GetMainSignals().RegisterSharedValidationInterface(callbacks);
}
void UnregisterSharedValidationInterface(std::shared_ptr<CValidationInterface> callbacks)
{
GetMainSignals().UnregisterSharedValidationInterface(callbacks);
}
void CallFunctionInValidationInterfaceQueue(std::function<void ()> func)
{
GetMainSignals().CallFunctionInValidationInterfaceQueue(func);
}
void SyncWithValidationInterfaceQueue()
{
GetMainSignals().SyncWithValidationInterfaceQueue();
}