GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge f7367b88e1 into merged_master (Bitcoin PR bitcoin/bitcoin#23842)

Browse source
This commit is contained in:
Byron Hambly 2023-06-14 06:43:35 +00:00
commit 01c3d7fbec
26 changed files with 62 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/node/interfaces.cpp
View file

@ -63,7 +63,7 @@ using interfaces::FoundBlock;
using interfaces::Handler;
using interfaces::MakeHandler;
using interfaces::Node;
using interfaces::WalletClient;
using interfaces::WalletLoader;
namespace node {
namespace {
@ -280,9 +280,9 @@ public:
{
return BroadcastTransaction(*m_context, std::move(tx), err_string, max_tx_fee, /*relay=*/ true, /*wait_callback=*/ false);
}
WalletClient& walletClient() override
WalletLoader& walletLoader() override
{
return *Assert(m_context->wallet_client);
return *Assert(m_context->wallet_loader);
}
std::unique_ptr<Handler> handleInitMessage(InitMessageFn fn) override
{