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 6664211be2 into merged_master (Bitcoin PR #21574)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-29 22:00:51 +00:00
commit 770892540f
11 changed files with 32 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/node/interfaces.cpp
View file

@ -80,7 +80,7 @@ public:
}
bool appInitMain(interfaces::BlockAndHeaderTipInfo* tip_info) override
{
return AppInitMain(m_context_ref, *m_context, tip_info);
return AppInitMain(*m_context, tip_info);
}
void appShutdown() override
{
@ -244,7 +244,8 @@ public:
CFeeRate getDustRelayFee() override { return ::dustRelayFee; }
UniValue executeRpc(const std::string& command, const UniValue& params, const std::string& uri) override
{
JSONRPCRequest req(m_context_ref);
JSONRPCRequest req;
req.context = m_context;
req.params = params;
req.strMethod = command;
req.URI = uri;
@ -314,14 +315,8 @@ public:
void setContext(NodeContext* context) override
{
m_context = context;
if (context) {
m_context_ref = context;
} else {
m_context_ref.reset();
}
}
NodeContext* m_context{nullptr};
std::any m_context_ref;
};
bool FillBlock(const CBlockIndex* index, const FoundBlock& block, UniqueLock<RecursiveMutex>& lock, const CChain& active)