highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-11-11 14:38:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

tests: Avoid using C-style NUL-terminated strings as arguments

Browse Source
This commit is contained in:
practicalswift
2019-12-29 20:23:48 +00:00
parent fefb9165f2
commit 7a046cdc14
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/addrman_tests.cpp
View File

@@ -59,29 +59,20 @@ public:
} }
}; };
static CNetAddr ResolveIP(const char* ip) static CNetAddr ResolveIP(const std::string& ip)
{ {
CNetAddr addr; CNetAddr addr;
BOOST_CHECK_MESSAGE(LookupHost(ip, addr, false), strprintf("failed to resolve: %s", ip)); BOOST_CHECK_MESSAGE(LookupHost(ip, addr, false), strprintf("failed to resolve: %s", ip));
return addr; return addr;
} }
static CNetAddr ResolveIP(std::string ip) static CService ResolveService(const std::string& ip, const int port = 0)
{
return ResolveIP(ip.c_str());
}
static CService ResolveService(const char* ip, int port = 0)
{ {
CService serv; CService serv;
BOOST_CHECK_MESSAGE(Lookup(ip, serv, port, false), strprintf("failed to resolve: %s:%i", ip, port)); BOOST_CHECK_MESSAGE(Lookup(ip, serv, port, false), strprintf("failed to resolve: %s:%i", ip, port));
return serv; return serv;
} }
static CService ResolveService(std::string ip, int port = 0)
{
return ResolveService(ip.c_str(), port);
}
BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(addrman_tests, BasicTestingSetup)

6
src/test/netbase_tests.cpp
View File

@@ -13,21 +13,21 @@
BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(netbase_tests, BasicTestingSetup)
static CNetAddr ResolveIP(const char* ip) static CNetAddr ResolveIP(const std::string& ip)
{ {
CNetAddr addr; CNetAddr addr;
LookupHost(ip, addr, false); LookupHost(ip, addr, false);
return addr; return addr;
} }
static CSubNet ResolveSubNet(const char* subnet) static CSubNet ResolveSubNet(const std::string& subnet)
{ {
CSubNet ret; CSubNet ret;
LookupSubNet(subnet, ret); LookupSubNet(subnet, ret);
return ret; return ret;
} }
static CNetAddr CreateInternal(const char* host) static CNetAddr CreateInternal(const std::string& host)
{ {
CNetAddr addr; CNetAddr addr;
addr.SetInternal(host); addr.SetInternal(host);