fix: don't remove handlers too early

Author: knst

src/init.cpp

@@ -289,7 +289,6 @@ void PrepareShutdown(NodeContext& node)
     StopREST();
     StopRPC();
     StopHTTPServer();
-    if (node.peerman) node.peerman->RemoveHandlers();
 
     if (node.active_ctx) node.active_ctx->Stop();
     if (node.peerman) node.peerman->StopHandlers();

src/net_processing.cpp

@@ -595,6 +595,11 @@ class PeerManagerImpl final : public PeerManager
                     const std::unique_ptr<ActiveContext>& active_ctx, CJWalletManager* const cj_walletman,
                     const std::unique_ptr<LLMQContext>& llmq_ctx, bool ignore_incoming_txs);
 
+    ~PeerManagerImpl()
+    {
+        RemoveHandlers();
+    }
+
     /** Overridden from CValidationInterface. */
     void BlockConnected(const std::shared_ptr<const CBlock>& pblock, const CBlockIndex* pindexConnected) override
         EXCLUSIVE_LOCKS_REQUIRED(!m_peer_mutex, !m_recent_confirmed_transactions_mutex);