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 8c049fe9af into merged_master (Bitcoin PR #19771)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-26 12:47:11 +00:00
commit b47f3355c7
9 changed files with 36 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/interfaces.cpp
View file

@ -96,7 +96,7 @@ public:
bool shutdownRequested() override { return ShutdownRequested(); }
void mapPort(bool use_upnp, bool use_natpmp) override { StartMapPort(use_upnp, use_natpmp); }
bool getProxy(Network net, proxyType& proxy_info) override { return GetProxy(net, proxy_info); }
size_t getNodeCount(CConnman::NumConnections flags) override
size_t getNodeCount(ConnectionDirection flags) override
{
return m_context->connman ? m_context->connman->GetNodeCount(flags) : 0;
}