diff --git a/src/net_permissions.h b/src/net_permissions.h index 6d895715e6..38e528e1dd 100644 --- a/src/net_permissions.h +++ b/src/net_permissions.h @@ -16,7 +16,6 @@ struct bilingual_str; extern const std::vector NET_PERMISSIONS_DOC; enum class NetPermissionFlags : uint32_t { - // NOTE: When adding here, be sure to update net_permissions.cpp's NetPermissions::ToStrings too None = 0, // Can query bloomfilter even if -peerbloomfilters is false BloomFilter = (1U << 1), diff --git a/src/test/netbase_tests.cpp b/src/test/netbase_tests.cpp index b20e479b55..0e755a9d18 100644 --- a/src/test/netbase_tests.cpp +++ b/src/test/netbase_tests.cpp @@ -463,20 +463,15 @@ BOOST_AUTO_TEST_CASE(netpermissions_test) BOOST_CHECK(NetWhitelistPermissions::TryParse("bloom,forcerelay,noban,relay,mempool@1.2.3.4/32", whitelistPermissions, error)); const auto strings = NetPermissions::ToStrings(NetPermissionFlags::All); - const std::vector expected_strings{ - "blockfilters", - "bloomfilter", - "forcerelay", - "relay", - "noban", - "mempool", - "download", - "addr", - }; - BOOST_CHECK_EQUAL(strings.size(), expected_strings.size()); - for (const auto& expected : expected_strings) { - BOOST_CHECK(std::find(strings.begin(), strings.end(), expected) != strings.end()); - } + BOOST_CHECK_EQUAL(strings.size(), 8U); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "blockfilters") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "bloomfilter") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "forcerelay") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "relay") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "noban") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "mempool") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "download") != strings.end()); + BOOST_CHECK(std::find(strings.begin(), strings.end(), "addr") != strings.end()); } BOOST_AUTO_TEST_CASE(netbase_dont_resolve_strings_with_embedded_nul_characters)