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

Merge 544709763e into merged_master (Bitcoin PR #18571)

Browse source 
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:20 +00:00
commit 2016bea80a
13 changed files with 71 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/interfaces/node.cpp
View file

@ -97,7 +97,7 @@ public:
StopMapPort();
}
}
void setupServerArgs() override { return SetupServerArgs(); }
void setupServerArgs() override { return SetupServerArgs(m_context); }
bool getProxy(Network net, proxyType& proxy_info) override { return GetProxy(net, proxy_info); }
size_t getNodeCount(CConnman::NumConnections flags) override
{