Merge 33c466a642 into merged_master (Bitcoin PR #16787)

This commit is contained in:
Andrew Poelstra 2020-11-09 21:20:23 +00:00
commit 5b89be04ff
4 changed files with 39 additions and 2 deletions

View file

@ -745,6 +745,24 @@ std::vector<CScript> EvalDescriptorStringOrObject(const UniValue& scanobject, Fl
return ret;
}
UniValue GetServicesNames(ServiceFlags services)
{
UniValue servicesNames(UniValue::VARR);
if (services & NODE_NETWORK)
servicesNames.push_back("NETWORK");
if (services & NODE_GETUTXO)
servicesNames.push_back("GETUTXO");
if (services & NODE_BLOOM)
servicesNames.push_back("BLOOM");
if (services & NODE_WITNESS)
servicesNames.push_back("WITNESS");
if (services & NODE_NETWORK_LIMITED)
servicesNames.push_back("NETWORK_LIMITED");
return servicesNames;
}
//
// ELEMENTS