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

Merge 848b11615b into merged_master (Bitcoin PR bitcoin/bitcoin#22834)

Browse source
This commit is contained in:
Byron Hambly 2023-07-03 09:33:46 +00:00
commit 7d91422a87
14 changed files with 72 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/interfaces.cpp
View file

@ -113,7 +113,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); }
bool getProxy(Network net, Proxy& proxy_info) override { return GetProxy(net, proxy_info); }
size_t getNodeCount(ConnectionDirection flags) override
{
return m_context->connman ? m_context->connman->GetNodeCount(flags) : 0;