Merge pull request #5455

e3dea478 unit_tests: undo is_blocked implementation factoring (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-04-17 08:27:23 +02:00
commit 4609b36608
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -93,7 +93,18 @@ typedef nodetool::node_server<cryptonote::t_cryptonote_protocol_handler<test_cor
static bool is_blocked(Server &server, const epee::net_utils::network_address &address, time_t *t = NULL) static bool is_blocked(Server &server, const epee::net_utils::network_address &address, time_t *t = NULL)
{ {
return server.is_host_blocked(address.host_str(), t); const std::string host = address.host_str();
std::map<std::string, time_t> hosts = server.get_blocked_hosts();
for (auto rec: hosts)
{
if (rec.first == host)
{
if (t)
*t = rec.second;
return true;
}
}
return false;
} }
TEST(ban, add) TEST(ban, add)