From dacf8592189883705538cb1764f21e6e3895209a Mon Sep 17 00:00:00 2001
From: Kittywhiskers Van Gogh <63189531+kwvg@users.noreply.github.com>
Date: Thu, 4 Jul 2024 13:26:27 +0000
Subject: [PATCH] refactor: make `pdsNotificationInterface` a `unique_ptr`,
 rename

---
 src/dsnotificationinterface.cpp |  2 ++
 src/dsnotificationinterface.h   |  2 ++
 src/init.cpp                    | 16 +++++++---------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/dsnotificationinterface.cpp b/src/dsnotificationinterface.cpp
index 880ada8a78..701f96ccaa 100644
--- a/src/dsnotificationinterface.cpp
+++ b/src/dsnotificationinterface.cpp
@@ -153,3 +153,5 @@ void CDSNotificationInterface::NotifyChainLock(const CBlockIndex* pindex, const
     m_llmq_ctx->isman->NotifyChainLock(pindex);
     m_cj_ctx->dstxman->NotifyChainLock(pindex, *m_llmq_ctx->clhandler, m_mn_sync);
 }
+
+std::unique_ptr<CDSNotificationInterface> g_ds_notification_interface;
diff --git a/src/dsnotificationinterface.h b/src/dsnotificationinterface.h
index c98f913880..d58d178a1b 100644
--- a/src/dsnotificationinterface.h
+++ b/src/dsnotificationinterface.h
@@ -60,4 +60,6 @@ private:
     const std::unique_ptr<CJContext>& m_cj_ctx;
 };
 
+extern std::unique_ptr<CDSNotificationInterface> g_ds_notification_interface;
+
 #endif // BITCOIN_DSNOTIFICATIONINTERFACE_H
diff --git a/src/init.cpp b/src/init.cpp
index 18decacf04..81f05e48fd 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -141,8 +141,6 @@ static constexpr bool DEFAULT_PROXYRANDOMIZE{true};
 static constexpr bool DEFAULT_REST_ENABLE{false};
 static constexpr bool DEFAULT_I2P_ACCEPT_INCOMING{true};
 
-static CDSNotificationInterface* pdsNotificationInterface = nullptr;
-
 #ifdef WIN32
 // Win32 LevelDB doesn't use filedescriptors, and the ones used for
 // accessing block files don't count towards the fd_set size limit
@@ -369,11 +367,11 @@ void PrepareShutdown(NodeContext& node)
     }
 #endif
 
-    if (pdsNotificationInterface) {
-        UnregisterValidationInterface(pdsNotificationInterface);
-        delete pdsNotificationInterface;
-        pdsNotificationInterface = nullptr;
+    if (g_ds_notification_interface) {
+        UnregisterValidationInterface(g_ds_notification_interface.get());
+        g_ds_notification_interface.reset();
     }
+
     if (node.mn_activeman) {
         UnregisterValidationInterface(node.mn_activeman.get());
         node.mn_activeman.reset();
@@ -2147,10 +2145,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                                      node.cj_ctx, node.llmq_ctx, ignores_incoming_txs);
     RegisterValidationInterface(node.peerman.get());
 
-    pdsNotificationInterface = new CDSNotificationInterface(
+    g_ds_notification_interface = std::make_unique<CDSNotificationInterface>(
         *node.connman, *node.mn_sync, *node.govman, *node.peerman, chainman, node.mn_activeman.get(), node.dmnman, node.llmq_ctx, node.cj_ctx
     );
-    RegisterValidationInterface(pdsNotificationInterface);
+    RegisterValidationInterface(g_ds_notification_interface.get());
 
     // ********************************************************* Step 7c: Setup CoinJoin
 
@@ -2327,7 +2325,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
     }
 
     chainman.m_load_block = std::thread(&util::TraceThread, "loadblk", [=, &args, &chainman, &node] {
-        ThreadImport(chainman, *node.dmnman, *pdsNotificationInterface, vImportFiles, node.mn_activeman.get(), args);
+        ThreadImport(chainman, *node.dmnman, *g_ds_notification_interface, vImportFiles, node.mn_activeman.get(), args);
     });
 
     // Wait for genesis block to be processed