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

Merge 602b038d43 into merged_master (Bitcoin PR #21366)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-29 00:32:18 +00:00
commit d20af8f9ea
23 changed files with 90 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/init.cpp
View file

@ -841,7 +841,7 @@ static bool InitSanityCheck()
return true;
}
static bool AppInitServers(const util::Ref& context, NodeContext& node)
static bool AppInitServers(const std::any& context, NodeContext& node)
{
const ArgsManager& args = *Assert(node.args);
RPCServer::OnStarted(&OnRPCStarted);
@ -1327,7 +1327,7 @@ bool AppInitInterfaces(NodeContext& node)
return true;
}
bool AppInitMain(const util::Ref& context, NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
bool AppInitMain(const std::any& context, NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
{
const ArgsManager& args = *Assert(node.args);
const CChainParams& chainparams = Params();