From 1c65d427bbf61bb558cf7e18f7aff99b19f68508 Mon Sep 17 00:00:00 2001 From: Martin Zumsande Date: Sun, 12 Dec 2021 21:37:34 +0000 Subject: [PATCH] test: Inline SimConnFail function No need for a function, since it is only used once. Co-Authored-By: Amiti Uttarwar --- src/test/addrman_tests.cpp | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/test/addrman_tests.cpp b/src/test/addrman_tests.cpp index 4745d29f9fc..4a877843baa 100644 --- a/src/test/addrman_tests.cpp +++ b/src/test/addrman_tests.cpp @@ -46,18 +46,6 @@ public: LOCK(m_impl->cs); m_impl->Delete(nId); } - - // Simulates connection failure so that we can test eviction of offline nodes - void SimConnFail(const CService& addr) - { - int64_t nLastSuccess = 1; - // Set last good connection in the deep past. - Good(addr, nLastSuccess); - - bool count_failure = false; - int64_t nLastTry = GetAdjustedTime() - 61; - Attempt(addr, count_failure, nLastTry); - } }; static CNetAddr ResolveIP(const std::string& ip) @@ -897,7 +885,9 @@ BOOST_AUTO_TEST_CASE(addrman_evictionworks) BOOST_CHECK_EQUAL(info.ToString(), "250.1.1.19:0"); // Ensure test of address fails, so that it is evicted. - addrman.SimConnFail(info); + // Update entry in tried by setting last good connection in the deep past. + BOOST_CHECK(!addrman.Good(info, /*nTime=*/1)); + addrman.Attempt(info, /*fCountFailure=*/false, /*nTime=*/GetAdjustedTime() - 61); // Should swap 36 for 19. addrman.ResolveCollisions();