Diff-minimise

This commit is contained in:
Luke Dashjr 2020-11-12 02:03:28 +00:00
parent a0d0807abc
commit d3bcf469ce
2 changed files with 9 additions and 15 deletions

View File

@ -22,7 +22,6 @@ constexpr bool DEFAULT_WHITELISTRELAY = true;
constexpr bool DEFAULT_WHITELISTFORCERELAY = false; constexpr bool DEFAULT_WHITELISTFORCERELAY = false;
enum class NetPermissionFlags : uint32_t { enum class NetPermissionFlags : uint32_t {
// NOTE: When adding here, be sure to update net_permissions.cpp's NetPermissions::ToStrings too
None = 0, None = 0,
// Can query bloomfilter even if -peerbloomfilters is false // Can query bloomfilter even if -peerbloomfilters is false
BloomFilter = (1U << 1), BloomFilter = (1U << 1),

View File

@ -465,20 +465,15 @@ BOOST_AUTO_TEST_CASE(netpermissions_test)
BOOST_CHECK_EQUAL(connection_direction, ConnectionDirection::Both); BOOST_CHECK_EQUAL(connection_direction, ConnectionDirection::Both);
const auto strings = NetPermissions::ToStrings(NetPermissionFlags::All); const auto strings = NetPermissions::ToStrings(NetPermissionFlags::All);
const std::vector<std::string> expected_strings{ BOOST_CHECK_EQUAL(strings.size(), 8U);
"blockfilters", BOOST_CHECK(std::find(strings.begin(), strings.end(), "blockfilters") != strings.end());
"bloomfilter", BOOST_CHECK(std::find(strings.begin(), strings.end(), "bloomfilter") != strings.end());
"forcerelay", BOOST_CHECK(std::find(strings.begin(), strings.end(), "forcerelay") != strings.end());
"relay", BOOST_CHECK(std::find(strings.begin(), strings.end(), "relay") != strings.end());
"noban", BOOST_CHECK(std::find(strings.begin(), strings.end(), "noban") != strings.end());
"mempool", BOOST_CHECK(std::find(strings.begin(), strings.end(), "mempool") != strings.end());
"download", BOOST_CHECK(std::find(strings.begin(), strings.end(), "download") != strings.end());
"addr", BOOST_CHECK(std::find(strings.begin(), strings.end(), "addr") != strings.end());
};
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_AUTO_TEST_CASE(netbase_dont_resolve_strings_with_embedded_nul_characters) BOOST_AUTO_TEST_CASE(netbase_dont_resolve_strings_with_embedded_nul_characters)