mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

GUI: Refactor formatServicesStr to warn when a ServicesFlag is missing

Browse Source
This commit is contained in:
Luke Dashjr 2019-11-14 04:50:54 +00:00
parent df77de8c21
commit 4341bffb6e
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/protocol.h
View File

@ -245,6 +245,7 @@ const std::vector<std::string> &getAllNetMessageTypes();
/** nServices flags */
enum ServiceFlags : uint64_t {
// NOTE: When adding here, be sure to update qt/guiutil.cpp's formatServicesStr too
// Nothing
NODE_NONE = 0,
// NODE_NETWORK means that the node is capable of serving the complete block chain. It is currently

43
src/qt/guiutil.cpp
View File

@ -815,6 +815,24 @@ QString formatDurationStr(int secs)
return strList.join(" ");
}
QString serviceFlagToStr(const quint64 mask, const int bit)
{
switch (ServiceFlags(mask)) {
case NODE_NONE: abort(); // impossible
case NODE_NETWORK: return "NETWORK";
case NODE_GETUTXO: return "GETUTXO";
case NODE_BLOOM: return "BLOOM";
case NODE_WITNESS: return "WITNESS";
case NODE_NETWORK_LIMITED: return "NETWORK_LIMITED";
// Not using default, so we get warned when a case is missing
}
if (bit < 8) {
return QString("%1[%2]").arg("UNKNOWN").arg(mask);
} else {
return QString("%1[2^%2]").arg("UNKNOWN").arg(bit);
}
}
QString formatServicesStr(quint64 mask)
{
QStringList strList;
@ -823,30 +841,7 @@ QString formatServicesStr(quint64 mask)
uint64_t check = 1LL << i;
if (mask & check)
{
switch (check)
{
case NODE_NETWORK:
strList.append("NETWORK");
break;
case NODE_GETUTXO:
strList.append("GETUTXO");
break;
case NODE_BLOOM:
strList.append("BLOOM");
break;
case NODE_WITNESS:
strList.append("WITNESS");
break;
case NODE_NETWORK_LIMITED:
strList.append("NETWORK_LIMITED");
break;
default:
if (i < 8) {
strList.append(QString("%1[%2]").arg("UNKNOWN").arg(check));
} else {
strList.append(QString("%1[2^%2]").arg("UNKNOWN").arg(i));
}
}
strList.append(serviceFlagToStr(check, i));
}
}