Merge abdfd2d0e3 into merged_master (Bitcoin PR #19219)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:09:20 +00:00
commit ceefa62cdb
16 changed files with 154 additions and 143 deletions

View file

@ -146,10 +146,10 @@ public:
}
return false;
}
bool ban(const CNetAddr& net_addr, BanReason reason, int64_t ban_time_offset) override
bool ban(const CNetAddr& net_addr, int64_t ban_time_offset) override
{
if (m_context.banman) {
m_context.banman->Ban(net_addr, reason, ban_time_offset);
m_context.banman->Ban(net_addr, ban_time_offset);
return true;
}
return false;