refactor: Rename ambiguous interfaces::MakeHandler functions

ryanofsky · ryanofsky · commit b19c4124b3c9 · 2022-11-29T08:12:24.000-04:00
diff --git a/src/common/interfaces.cpp b/src/common/interfaces.cpp
@@ -20,10 +20,10 @@ class CleanupHandler : public interfaces::Handler
     std::function<void()> m_cleanup;
 };
 
-class HandlerImpl : public interfaces::Handler
+class SignalHandler : public interfaces::Handler
 {
 public:
-    explicit HandlerImpl(boost::signals2::connection connection) : m_connection(std::move(connection)) {}
+    explicit SignalHandler(boost::signals2::connection connection) : m_connection(std::move(connection)) {}
 
     void disconnect() override { m_connection.disconnect(); }
 
@@ -39,14 +39,14 @@ class EchoImpl : public interfaces::Echo
 } // namespace common
 
 namespace interfaces {
-std::unique_ptr<Handler> MakeHandler(std::function<void()> cleanup)
+std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup)
 {
     return std::make_unique<common::CleanupHandler>(std::move(cleanup));
 }
 
-std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)
+std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection)
 {
-    return std::make_unique<common::HandlerImpl>(std::move(connection));
+    return std::make_unique<common::SignalHandler>(std::move(connection));
 }
 
 std::unique_ptr<Echo> MakeEcho() { return std::make_unique<common::EchoImpl>(); }
diff --git a/src/interfaces/handler.h b/src/interfaces/handler.h
@@ -29,10 +29,10 @@ class Handler
 };
 
 //! Return handler wrapping a boost signal connection.
-std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection);
+std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection);
 
 //! Return handler wrapping a cleanup function.
-std::unique_ptr<Handler> MakeHandler(std::function<void()> cleanup);
+std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup);
 
 } // namespace interfaces
 
diff --git a/src/node/interfaces.cpp b/src/node/interfaces.cpp
@@ -64,7 +64,7 @@ using interfaces::BlockTip;
 using interfaces::Chain;
 using interfaces::FoundBlock;
 using interfaces::Handler;
-using interfaces::MakeHandler;
+using interfaces::MakeSignalHandler;
 using interfaces::Node;
 using interfaces::WalletLoader;
 
@@ -336,50 +336,50 @@ class NodeImpl : public Node
     }
     std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override
     {
-        return MakeHandler(::uiInterface.InitMessage_connect(fn));
+        return MakeSignalHandler(::uiInterface.InitMessage_connect(fn));
     }
     std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) override
     {
-        return MakeHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));
+        return MakeSignalHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));
     }
     std::unique_ptr<Handler> handleQuestion(QuestionFn fn) override
     {
-        return MakeHandler(::uiInterface.ThreadSafeQuestion_connect(fn));
+        return MakeSignalHandler(::uiInterface.ThreadSafeQuestion_connect(fn));
     }
     std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
     {
-        return MakeHandler(::uiInterface.ShowProgress_connect(fn));
+        return MakeSignalHandler(::uiInterface.ShowProgress_connect(fn));
     }
     std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) override
     {
-        return MakeHandler(::uiInterface.InitWallet_connect(fn));
+        return MakeSignalHandler(::uiInterface.InitWallet_connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override
     {
-        return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyNetworkActiveChanged(NotifyNetworkActiveChangedFn fn) override
     {
-        return MakeHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyAlertChanged(NotifyAlertChangedFn fn) override
     {
-        return MakeHandler(::uiInterface.NotifyAlertChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.NotifyAlertChanged_connect(fn));
     }
     std::unique_ptr<Handler> handleBannedListChanged(BannedListChangedFn fn) override
     {
-        return MakeHandler(::uiInterface.BannedListChanged_connect(fn));
+        return MakeSignalHandler(::uiInterface.BannedListChanged_connect(fn));
     }
     std::unique_ptr<Handler> handleNotifyBlockTip(NotifyBlockTipFn fn) override
     {
-        return MakeHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {
+        return MakeSignalHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {
             fn(sync_state, BlockTip{block->nHeight, block->GetBlockTime(), block->GetBlockHash()},
                 GuessVerificationProgress(Params().TxData(), block));
         }));
     }
     std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) override
     {
-        return MakeHandler(
+        return MakeSignalHandler(
             ::uiInterface.NotifyHeaderTip_connect([fn](SynchronizationState sync_state, int64_t height, int64_t timestamp, bool presync) {
                 fn(sync_state, BlockTip{(int)height, timestamp, uint256{}}, presync);
             }));
diff --git a/src/wallet/interfaces.cpp b/src/wallet/interfaces.cpp
@@ -36,7 +36,7 @@
 using interfaces::Chain;
 using interfaces::FoundBlock;
 using interfaces::Handler;
-using interfaces::MakeHandler;
+using interfaces::MakeSignalHandler;
 using interfaces::Wallet;
 using interfaces::WalletAddress;
 using interfaces::WalletBalances;
@@ -486,34 +486,34 @@ class WalletImpl : public Wallet
     bool isLegacy() override { return m_wallet->IsLegacy(); }
     std::unique_ptr<Handler> handleUnload(UnloadFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyUnload.connect(fn));
+        return MakeSignalHandler(m_wallet->NotifyUnload.connect(fn));
     }
     std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
     {
-        return MakeHandler(m_wallet->ShowProgress.connect(fn));
+        return MakeSignalHandler(m_wallet->ShowProgress.connect(fn));
     }
     std::unique_ptr<Handler> handleStatusChanged(StatusChangedFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));
+        return MakeSignalHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));
     }
     std::unique_ptr<Handler> handleAddressBookChanged(AddressBookChangedFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyAddressBookChanged.connect(
+        return MakeSignalHandler(m_wallet->NotifyAddressBookChanged.connect(
             [fn](const CTxDestination& address, const std::string& label, bool is_mine,
                  const std::string& purpose, ChangeType status) { fn(address, label, is_mine, purpose, status); }));
     }
     std::unique_ptr<Handler> handleTransactionChanged(TransactionChangedFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyTransactionChanged.connect(
+        return MakeSignalHandler(m_wallet->NotifyTransactionChanged.connect(
             [fn](const uint256& txid, ChangeType status) { fn(txid, status); }));
     }
     std::unique_ptr<Handler> handleWatchOnlyChanged(WatchOnlyChangedFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));
+        return MakeSignalHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));
     }
     std::unique_ptr<Handler> handleCanGetAddressesChanged(CanGetAddressesChangedFn fn) override
     {
-        return MakeHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));
+        return MakeSignalHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));
     }
     CWallet* wallet() override { return m_wallet.get(); }
 
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -171,7 +171,7 @@ std::unique_ptr<interfaces::Handler> HandleLoadWallet(WalletContext& context, Lo
 {
     LOCK(context.wallets_mutex);
     auto it = context.wallet_load_fns.emplace(context.wallet_load_fns.end(), std::move(load_wallet));
-    return interfaces::MakeHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });
+    return interfaces::MakeCleanupHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });
 }
 
 void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>& wallet)

Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ class CleanupHandler : public interfaces::Handler`
`20`	`20`	`std::function<void()> m_cleanup;`
`21`	`21`	`};`
`22`	`22`
`23`		`-class HandlerImpl : public interfaces::Handler`
	`23`	`+class SignalHandler : public interfaces::Handler`
`24`	`24`	`{`
`25`	`25`	`public:`
`26`		`- explicit HandlerImpl(boost::signals2::connection connection) : m_connection(std::move(connection)) {}`
	`26`	`+ explicit SignalHandler(boost::signals2::connection connection) : m_connection(std::move(connection)) {}`
`27`	`27`
`28`	`28`	`void disconnect() override { m_connection.disconnect(); }`
`29`	`29`
`@@ -39,14 +39,14 @@ class EchoImpl : public interfaces::Echo`
`39`	`39`	`} // namespace common`
`40`	`40`
`41`	`41`	`namespace interfaces {`
`42`		`-std::unique_ptr<Handler> MakeHandler(std::function<void()> cleanup)`
	`42`	`+std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup)`
`43`	`43`	`{`
`44`	`44`	`return std::make_unique<common::CleanupHandler>(std::move(cleanup));`
`45`	`45`	`}`
`46`	`46`
`47`		`-std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)`
	`47`	`+std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection)`
`48`	`48`	`{`
`49`		`- return std::make_unique<common::HandlerImpl>(std::move(connection));`
	`49`	`+ return std::make_unique<common::SignalHandler>(std::move(connection));`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`std::unique_ptr<Echo> MakeEcho() { return std::make_unique<common::EchoImpl>(); }`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ using interfaces::BlockTip;`
`64`	`64`	`using interfaces::Chain;`
`65`	`65`	`using interfaces::FoundBlock;`
`66`	`66`	`using interfaces::Handler;`
`67`		`-using interfaces::MakeHandler;`
	`67`	`+using interfaces::MakeSignalHandler;`
`68`	`68`	`using interfaces::Node;`
`69`	`69`	`using interfaces::WalletLoader;`
`70`	`70`
`@@ -336,50 +336,50 @@ class NodeImpl : public Node`
`336`	`336`	`}`
`337`	`337`	`std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override`
`338`	`338`	`{`
`339`		`- return MakeHandler(::uiInterface.InitMessage_connect(fn));`
	`339`	`+ return MakeSignalHandler(::uiInterface.InitMessage_connect(fn));`
`340`	`340`	`}`
`341`	`341`	`std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) override`
`342`	`342`	`{`
`343`		`- return MakeHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));`
	`343`	`+ return MakeSignalHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));`
`344`	`344`	`}`
`345`	`345`	`std::unique_ptr<Handler> handleQuestion(QuestionFn fn) override`
`346`	`346`	`{`
`347`		`- return MakeHandler(::uiInterface.ThreadSafeQuestion_connect(fn));`
	`347`	`+ return MakeSignalHandler(::uiInterface.ThreadSafeQuestion_connect(fn));`
`348`	`348`	`}`
`349`	`349`	`std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override`
`350`	`350`	`{`
`351`		`- return MakeHandler(::uiInterface.ShowProgress_connect(fn));`
	`351`	`+ return MakeSignalHandler(::uiInterface.ShowProgress_connect(fn));`
`352`	`352`	`}`
`353`	`353`	`std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) override`
`354`	`354`	`{`
`355`		`- return MakeHandler(::uiInterface.InitWallet_connect(fn));`
	`355`	`+ return MakeSignalHandler(::uiInterface.InitWallet_connect(fn));`
`356`	`356`	`}`
`357`	`357`	`std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override`
`358`	`358`	`{`
`359`		`- return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));`
	`359`	`+ return MakeSignalHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));`
`360`	`360`	`}`
`361`	`361`	`std::unique_ptr<Handler> handleNotifyNetworkActiveChanged(NotifyNetworkActiveChangedFn fn) override`
`362`	`362`	`{`
`363`		`- return MakeHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));`
	`363`	`+ return MakeSignalHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));`
`364`	`364`	`}`
`365`	`365`	`std::unique_ptr<Handler> handleNotifyAlertChanged(NotifyAlertChangedFn fn) override`
`366`	`366`	`{`
`367`		`- return MakeHandler(::uiInterface.NotifyAlertChanged_connect(fn));`
	`367`	`+ return MakeSignalHandler(::uiInterface.NotifyAlertChanged_connect(fn));`
`368`	`368`	`}`
`369`	`369`	`std::unique_ptr<Handler> handleBannedListChanged(BannedListChangedFn fn) override`
`370`	`370`	`{`
`371`		`- return MakeHandler(::uiInterface.BannedListChanged_connect(fn));`
	`371`	`+ return MakeSignalHandler(::uiInterface.BannedListChanged_connect(fn));`
`372`	`372`	`}`
`373`	`373`	`std::unique_ptr<Handler> handleNotifyBlockTip(NotifyBlockTipFn fn) override`
`374`	`374`	`{`
`375`		`- return MakeHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {`
	`375`	`+ return MakeSignalHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {`
`376`	`376`	`fn(sync_state, BlockTip{block->nHeight, block->GetBlockTime(), block->GetBlockHash()},`
`377`	`377`	`GuessVerificationProgress(Params().TxData(), block));`
`378`	`378`	`}));`
`379`	`379`	`}`
`380`	`380`	`std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) override`
`381`	`381`	`{`
`382`		`- return MakeHandler(`
	`382`	`+ return MakeSignalHandler(`
`383`	`383`	`::uiInterface.NotifyHeaderTip_connect([fn](SynchronizationState sync_state, int64_t height, int64_t timestamp, bool presync) {`
`384`	`384`	`fn(sync_state, BlockTip{(int)height, timestamp, uint256{}}, presync);`
`385`	`385`	`}));`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`using interfaces::Chain;`
`37`	`37`	`using interfaces::FoundBlock;`
`38`	`38`	`using interfaces::Handler;`
`39`		`-using interfaces::MakeHandler;`
	`39`	`+using interfaces::MakeSignalHandler;`
`40`	`40`	`using interfaces::Wallet;`
`41`	`41`	`using interfaces::WalletAddress;`
`42`	`42`	`using interfaces::WalletBalances;`
`@@ -486,34 +486,34 @@ class WalletImpl : public Wallet`
`486`	`486`	`bool isLegacy() override { return m_wallet->IsLegacy(); }`
`487`	`487`	`std::unique_ptr<Handler> handleUnload(UnloadFn fn) override`
`488`	`488`	`{`
`489`		`- return MakeHandler(m_wallet->NotifyUnload.connect(fn));`
	`489`	`+ return MakeSignalHandler(m_wallet->NotifyUnload.connect(fn));`
`490`	`490`	`}`
`491`	`491`	`std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override`
`492`	`492`	`{`
`493`		`- return MakeHandler(m_wallet->ShowProgress.connect(fn));`
	`493`	`+ return MakeSignalHandler(m_wallet->ShowProgress.connect(fn));`
`494`	`494`	`}`
`495`	`495`	`std::unique_ptr<Handler> handleStatusChanged(StatusChangedFn fn) override`
`496`	`496`	`{`
`497`		`- return MakeHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));`
	`497`	`+ return MakeSignalHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));`
`498`	`498`	`}`
`499`	`499`	`std::unique_ptr<Handler> handleAddressBookChanged(AddressBookChangedFn fn) override`
`500`	`500`	`{`
`501`		`- return MakeHandler(m_wallet->NotifyAddressBookChanged.connect(`
	`501`	`+ return MakeSignalHandler(m_wallet->NotifyAddressBookChanged.connect(`
`502`	`502`	`[fn](const CTxDestination& address, const std::string& label, bool is_mine,`
`503`	`503`	`const std::string& purpose, ChangeType status) { fn(address, label, is_mine, purpose, status); }));`
`504`	`504`	`}`
`505`	`505`	`std::unique_ptr<Handler> handleTransactionChanged(TransactionChangedFn fn) override`
`506`	`506`	`{`
`507`		`- return MakeHandler(m_wallet->NotifyTransactionChanged.connect(`
	`507`	`+ return MakeSignalHandler(m_wallet->NotifyTransactionChanged.connect(`
`508`	`508`	`[fn](const uint256& txid, ChangeType status) { fn(txid, status); }));`
`509`	`509`	`}`
`510`	`510`	`std::unique_ptr<Handler> handleWatchOnlyChanged(WatchOnlyChangedFn fn) override`
`511`	`511`	`{`
`512`		`- return MakeHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));`
	`512`	`+ return MakeSignalHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));`
`513`	`513`	`}`
`514`	`514`	`std::unique_ptr<Handler> handleCanGetAddressesChanged(CanGetAddressesChangedFn fn) override`
`515`	`515`	`{`
`516`		`- return MakeHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));`
	`516`	`+ return MakeSignalHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));`
`517`	`517`	`}`
`518`	`518`	`CWallet* wallet() override { return m_wallet.get(); }`
`519`	`519`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ std::unique_ptr<interfaces::Handler> HandleLoadWallet(WalletContext& context, Lo`
`171`	`171`	`{`
`172`	`172`	`LOCK(context.wallets_mutex);`
`173`	`173`	`auto it = context.wallet_load_fns.emplace(context.wallet_load_fns.end(), std::move(load_wallet));`
`174`		`- return interfaces::MakeHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });`
	`174`	`+ return interfaces::MakeCleanupHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>& wallet)`