Refactor: Turn the internal addrman check helper into a forced check

2 files changed, 10 insertions, 9 deletions

diff --git a/src/addrman.cpp b/src/addrman.cpp
index e3f370134f..a6f38075d8 100644
--- a/src/addrman.cpp
+++ b/src/addrman.cpp
@@ -747,21 +747,21 @@ void CAddrMan::Check() const
 {
     AssertLockHeld(cs);
 
-    const int err = Check_();
+    // Run consistency checks 1 in m_consistency_check_ratio times if enabled
+    if (m_consistency_check_ratio == 0) return;
+    if (insecure_rand.randrange(m_consistency_check_ratio) >= 1) return;
+
+    const int err{ForceCheckAddrman()};
     if (err) {
         LogPrintf("ADDRMAN CONSISTENCY CHECK FAILED!!! err=%i\n", err);
         assert(false);
     }
 }
 
-int CAddrMan::Check_() const
+int CAddrMan::ForceCheckAddrman() const
 {
     AssertLockHeld(cs);
 
-    // Run consistency checks 1 in m_consistency_check_ratio times if enabled
-    if (m_consistency_check_ratio == 0) return 0;
-    if (insecure_rand.randrange(m_consistency_check_ratio) >= 1) return 0;
-
     LogPrint(BCLog::ADDRMAN, "Addrman checks started: new %i, tried %i, total %u\n", nNew, nTried, vRandom.size());
 
     std::unordered_set<int> setTried;
diff --git a/src/addrman.h b/src/addrman.h
index ca291d60ab..7dd8528bef 100644
--- a/src/addrman.h
+++ b/src/addrman.h
@@ -391,11 +391,12 @@ private:
     //! Return a random to-be-evicted tried table address.
     CAddrInfo SelectTriedCollision_() EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    //! Consistency check
+    //! Consistency check, taking into account m_consistency_check_ratio. Will std::abort if an inconsistency is detected.
     void Check() const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    //! Perform consistency check. Returns an error code or zero.
-    int Check_() const EXCLUSIVE_LOCKS_REQUIRED(cs);
+    //! Perform consistency check, regardless of m_consistency_check_ratio.
+    //! @returns an error code or zero.
+    int ForceCheckAddrman() const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     /**
      * Return all or many randomly selected addresses, optionally by network.