highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-10 22:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop JSONRPCRequest constructors after #21366

Browse Source 
This just makes an additional simplification after #21366 replaced
util::Ref with std::any. It was originally suggested
https://github.com/bitcoin/bitcoin/pull/21366#issuecomment-792044351 but
delayed for a followup. It would have prevented usage bug
https://github.com/bitcoin/bitcoin/pull/21572.
This commit is contained in:
Russell Yanofsky
2021-04-02 13:35:01 -04:00
parent aa69471ecd
commit 9044522ef7
10 changed files with 28 additions and 41 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)