From 460687a09c2af336fce853d9ffb790d01429eec6 Mon Sep 17 00:00:00 2001 From: Sjors Provoost Date: Mon, 26 Aug 2024 18:25:55 +0200 Subject: [PATCH] Remove unused CRPCSignals They are no longer used for anything since RPCNotifyBlockChange was replaced with waitTipChanged() from the mining interface. --- src/init.cpp | 12 ------------ src/rpc/server.cpp | 23 +++-------------------- src/rpc/server.h | 6 ------ 3 files changed, 3 insertions(+), 38 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 0a013d8ccb6..c9e2c281442 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -429,16 +429,6 @@ static void registerSignalHandler(int signal, void(*handler)(int)) } #endif -static void OnRPCStarted() -{ -} - -static void OnRPCStopped() -{ - g_best_block_cv.notify_all(); - LogDebug(BCLog::RPC, "RPC stopped.\n"); -} - void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc) { SetupHelpOptions(argsman); @@ -719,8 +709,6 @@ static void StartupNotify(const ArgsManager& args) static bool AppInitServers(NodeContext& node) { const ArgsManager& args = *Assert(node.args); - RPCServer::OnStarted(&OnRPCStarted); - RPCServer::OnStopped(&OnRPCStopped); if (!InitHTTPServer(*Assert(node.shutdown))) { return false; } diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index fb50d453fa9..618199c42f2 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -19,8 +19,7 @@ #include #include #include - -#include +#include #include #include @@ -70,22 +69,6 @@ struct RPCCommandExecution } }; -static struct CRPCSignals -{ - boost::signals2::signal Started; - boost::signals2::signal Stopped; -} g_rpcSignals; - -void RPCServer::OnStarted(std::function slot) -{ - g_rpcSignals.Started.connect(slot); -} - -void RPCServer::OnStopped(std::function slot) -{ - g_rpcSignals.Stopped.connect(slot); -} - std::string CRPCTable::help(const std::string& strCommand, const JSONRPCRequest& helpreq) const { std::string strRet; @@ -298,7 +281,6 @@ void StartRPC() { LogDebug(BCLog::RPC, "Starting RPC\n"); g_rpc_running = true; - g_rpcSignals.Started(); } void InterruptRPC() @@ -321,10 +303,11 @@ void StopRPC(const std::any& context) LogDebug(BCLog::RPC, "Stopping RPC\n"); WITH_LOCK(g_deadline_timers_mutex, deadlineTimers.clear()); DeleteAuthCookie(); - g_rpcSignals.Stopped(); + g_best_block_cv.notify_all(); node::NodeContext& node = EnsureAnyNodeContext(context); // The notifications interface doesn't exist between initialization step 4a and 7. if (node.notifications) node.notifications->m_tip_block_cv.notify_all(); + LogDebug(BCLog::RPC, "RPC stopped.\n"); }); } diff --git a/src/rpc/server.h b/src/rpc/server.h index a13ae3b1e58..a8896d4247a 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -19,12 +19,6 @@ class CRPCCommand; -namespace RPCServer -{ - void OnStarted(std::function slot); - void OnStopped(std::function slot); -} - /** Query whether RPC is running */ bool IsRPCRunning();