Skip to content

Commit ba4f6c5

Browse files
ryanofskyryanofsky
committed
refactor: Rename ambiguous interfaces::MakeHandler functions
1 parent e0b131e commit ba4f6c5

File tree

5 files changed

+28
-28
lines changed

5 files changed

+28
-28
lines changed

‎src/common/interfaces.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class CleanupHandler : public interfaces::Handler
2020
std::function<void()> m_cleanup;
2121
};
2222

23-
class HandlerImpl : public interfaces::Handler
23+
class SignalHandler : public interfaces::Handler
2424
{
2525
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)) {}
2727

2828
void disconnect() override { m_connection.disconnect(); }
2929

@@ -39,14 +39,14 @@ class EchoImpl : public interfaces::Echo
3939
} // namespace common
4040

4141
namespace interfaces {
42-
std::unique_ptr<Handler> MakeHandler(std::function<void()> cleanup)
42+
std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup)
4343
{
4444
return std::make_unique<common::CleanupHandler>(std::move(cleanup));
4545
}
4646

47-
std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection)
47+
std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection)
4848
{
49-
return std::make_unique<common::HandlerImpl>(std::move(connection));
49+
return std::make_unique<common::SignalHandler>(std::move(connection));
5050
}
5151

5252
std::unique_ptr<Echo> MakeEcho() { return std::make_unique<common::EchoImpl>(); }

‎src/interfaces/handler.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ class Handler
2929
};
3030

3131
//! Return handler wrapping a boost signal connection.
32-
std::unique_ptr<Handler> MakeHandler(boost::signals2::connection connection);
32+
std::unique_ptr<Handler> MakeSignalHandler(boost::signals2::connection connection);
3333

3434
//! Return handler wrapping a cleanup function.
35-
std::unique_ptr<Handler> MakeHandler(std::function<void()> cleanup);
35+
std::unique_ptr<Handler> MakeCleanupHandler(std::function<void()> cleanup);
3636

3737
} // namespace interfaces
3838

‎src/node/interfaces.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ using interfaces::BlockTip;
6161
using interfaces::Chain;
6262
using interfaces::FoundBlock;
6363
using interfaces::Handler;
64-
using interfaces::MakeHandler;
64+
using interfaces::MakeSignalHandler;
6565
using interfaces::Node;
6666
using interfaces::WalletLoader;
6767

@@ -333,50 +333,50 @@ class NodeImpl : public Node
333333
}
334334
std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override
335335
{
336-
return MakeHandler(::uiInterface.InitMessage_connect(fn));
336+
return MakeSignalHandler(::uiInterface.InitMessage_connect(fn));
337337
}
338338
std::unique_ptr<Handler> handleMessageBox(MessageBoxFn fn) override
339339
{
340-
return MakeHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));
340+
return MakeSignalHandler(::uiInterface.ThreadSafeMessageBox_connect(fn));
341341
}
342342
std::unique_ptr<Handler> handleQuestion(QuestionFn fn) override
343343
{
344-
return MakeHandler(::uiInterface.ThreadSafeQuestion_connect(fn));
344+
return MakeSignalHandler(::uiInterface.ThreadSafeQuestion_connect(fn));
345345
}
346346
std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
347347
{
348-
return MakeHandler(::uiInterface.ShowProgress_connect(fn));
348+
return MakeSignalHandler(::uiInterface.ShowProgress_connect(fn));
349349
}
350350
std::unique_ptr<Handler> handleInitWallet(InitWalletFn fn) override
351351
{
352-
return MakeHandler(::uiInterface.InitWallet_connect(fn));
352+
return MakeSignalHandler(::uiInterface.InitWallet_connect(fn));
353353
}
354354
std::unique_ptr<Handler> handleNotifyNumConnectionsChanged(NotifyNumConnectionsChangedFn fn) override
355355
{
356-
return MakeHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
356+
return MakeSignalHandler(::uiInterface.NotifyNumConnectionsChanged_connect(fn));
357357
}
358358
std::unique_ptr<Handler> handleNotifyNetworkActiveChanged(NotifyNetworkActiveChangedFn fn) override
359359
{
360-
return MakeHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));
360+
return MakeSignalHandler(::uiInterface.NotifyNetworkActiveChanged_connect(fn));
361361
}
362362
std::unique_ptr<Handler> handleNotifyAlertChanged(NotifyAlertChangedFn fn) override
363363
{
364-
return MakeHandler(::uiInterface.NotifyAlertChanged_connect(fn));
364+
return MakeSignalHandler(::uiInterface.NotifyAlertChanged_connect(fn));
365365
}
366366
std::unique_ptr<Handler> handleBannedListChanged(BannedListChangedFn fn) override
367367
{
368-
return MakeHandler(::uiInterface.BannedListChanged_connect(fn));
368+
return MakeSignalHandler(::uiInterface.BannedListChanged_connect(fn));
369369
}
370370
std::unique_ptr<Handler> handleNotifyBlockTip(NotifyBlockTipFn fn) override
371371
{
372-
return MakeHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {
372+
return MakeSignalHandler(::uiInterface.NotifyBlockTip_connect([fn](SynchronizationState sync_state, const CBlockIndex* block) {
373373
fn(sync_state, BlockTip{block->nHeight, block->GetBlockTime(), block->GetBlockHash()},
374374
GuessVerificationProgress(Params().TxData(), block));
375375
}));
376376
}
377377
std::unique_ptr<Handler> handleNotifyHeaderTip(NotifyHeaderTipFn fn) override
378378
{
379-
return MakeHandler(
379+
return MakeSignalHandler(
380380
::uiInterface.NotifyHeaderTip_connect([fn](SynchronizationState sync_state, int64_t height, int64_t timestamp, bool presync) {
381381
fn(sync_state, BlockTip{(int)height, timestamp, uint256{}}, presync);
382382
}));

‎src/wallet/interfaces.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
using interfaces::Chain;
3737
using interfaces::FoundBlock;
3838
using interfaces::Handler;
39-
using interfaces::MakeHandler;
39+
using interfaces::MakeSignalHandler;
4040
using interfaces::Wallet;
4141
using interfaces::WalletAddress;
4242
using interfaces::WalletBalances;
@@ -486,34 +486,34 @@ class WalletImpl : public Wallet
486486
bool isLegacy() override { return m_wallet->IsLegacy(); }
487487
std::unique_ptr<Handler> handleUnload(UnloadFn fn) override
488488
{
489-
return MakeHandler(m_wallet->NotifyUnload.connect(fn));
489+
return MakeSignalHandler(m_wallet->NotifyUnload.connect(fn));
490490
}
491491
std::unique_ptr<Handler> handleShowProgress(ShowProgressFn fn) override
492492
{
493-
return MakeHandler(m_wallet->ShowProgress.connect(fn));
493+
return MakeSignalHandler(m_wallet->ShowProgress.connect(fn));
494494
}
495495
std::unique_ptr<Handler> handleStatusChanged(StatusChangedFn fn) override
496496
{
497-
return MakeHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));
497+
return MakeSignalHandler(m_wallet->NotifyStatusChanged.connect([fn](CWallet*) { fn(); }));
498498
}
499499
std::unique_ptr<Handler> handleAddressBookChanged(AddressBookChangedFn fn) override
500500
{
501-
return MakeHandler(m_wallet->NotifyAddressBookChanged.connect(
501+
return MakeSignalHandler(m_wallet->NotifyAddressBookChanged.connect(
502502
[fn](const CTxDestination& address, const std::string& label, bool is_mine,
503503
const std::string& purpose, ChangeType status) { fn(address, label, is_mine, purpose, status); }));
504504
}
505505
std::unique_ptr<Handler> handleTransactionChanged(TransactionChangedFn fn) override
506506
{
507-
return MakeHandler(m_wallet->NotifyTransactionChanged.connect(
507+
return MakeSignalHandler(m_wallet->NotifyTransactionChanged.connect(
508508
[fn](const uint256& txid, ChangeType status) { fn(txid, status); }));
509509
}
510510
std::unique_ptr<Handler> handleWatchOnlyChanged(WatchOnlyChangedFn fn) override
511511
{
512-
return MakeHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));
512+
return MakeSignalHandler(m_wallet->NotifyWatchonlyChanged.connect(fn));
513513
}
514514
std::unique_ptr<Handler> handleCanGetAddressesChanged(CanGetAddressesChangedFn fn) override
515515
{
516-
return MakeHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));
516+
return MakeSignalHandler(m_wallet->NotifyCanGetAddressesChanged.connect(fn));
517517
}
518518
CWallet* wallet() override { return m_wallet.get(); }
519519

‎src/wallet/wallet.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ std::unique_ptr<interfaces::Handler> HandleLoadWallet(WalletContext& context, Lo
169169
{
170170
LOCK(context.wallets_mutex);
171171
auto it = context.wallet_load_fns.emplace(context.wallet_load_fns.end(), std::move(load_wallet));
172-
return interfaces::MakeHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });
172+
return interfaces::MakeCleanupHandler([&context, it] { LOCK(context.wallets_mutex); context.wallet_load_fns.erase(it); });
173173
}
174174

175175
void NotifyWalletLoaded(WalletContext& context, const std::shared_ptr<CWallet>& wallet)

0 commit comments

Comments
 (0)