Remove unused CRPCSignals

Sjors · Sjors · commit 460687a09c2a · 2024-09-17T09:27:44.000+02:00
They are no longer used for anything since RPCNotifyBlockChange was replaced with waitTipChanged() from the mining interface.
diff --git 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
@@ -19,8 +19,7 @@
 #include <util/strencodings.h>
 #include <util/string.h>
 #include <util/time.h>
-
-#include <boost/signals2/signal.hpp>
+#include <validation.h>
 
 #include <cassert>
 #include <chrono>
@@ -70,22 +69,6 @@ struct RPCCommandExecution
     }
 };
 
-static struct CRPCSignals
-{
-    boost::signals2::signal<void ()> Started;
-    boost::signals2::signal<void ()> Stopped;
-} g_rpcSignals;
-
-void RPCServer::OnStarted(std::function<void ()> slot)
-{
-    g_rpcSignals.Started.connect(slot);
-}
-
-void RPCServer::OnStopped(std::function<void ()> 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
@@ -19,12 +19,6 @@
 
 class CRPCCommand;
 
-namespace RPCServer
-{
-    void OnStarted(std::function<void ()> slot);
-    void OnStopped(std::function<void ()> slot);
-}
-
 /** Query whether RPC is running */
 bool IsRPCRunning();
 

Original file line number	Diff line number	Diff line change
`@@ -429,16 +429,6 @@ static void registerSignalHandler(int signal, void(*handler)(int))`
`429`	`429`	`}`
`430`	`430`	`#endif`
`431`	`431`
`432`		`-static void OnRPCStarted()`
`433`		`-{`
`434`		`-}`
`435`		`-`
`436`		`-static void OnRPCStopped()`
`437`		`-{`
`438`		`- g_best_block_cv.notify_all();`
`439`		`- LogDebug(BCLog::RPC, "RPC stopped.\n");`
`440`		`-}`
`441`		`-`
`442`	`432`	`void SetupServerArgs(ArgsManager& argsman, bool can_listen_ipc)`
`443`	`433`	`{`
`444`	`434`	`SetupHelpOptions(argsman);`
`@@ -719,8 +709,6 @@ static void StartupNotify(const ArgsManager& args)`
`719`	`709`	`static bool AppInitServers(NodeContext& node)`
`720`	`710`	`{`
`721`	`711`	`const ArgsManager& args = *Assert(node.args);`
`722`		`- RPCServer::OnStarted(&OnRPCStarted);`
`723`		`- RPCServer::OnStopped(&OnRPCStopped);`
`724`	`712`	`if (!InitHTTPServer(*Assert(node.shutdown))) {`
`725`	`713`	`return false;`
`726`	`714`	`}`