refactor: Apply consistent pattern for CAddrMan::Check usage

hebasto · jnewbery · hebasto · commit f79a664314b8 · 2021-06-14T17:28:37.000+03:00
Co-authored-by: John Newbery &lt;john@johnnewbery.com&gt;
diff --git a/src/addrman.h b/src/addrman.h
@@ -551,13 +551,10 @@ class CAddrMan
     //! Randomly select an address in tried that another address is attempting to evict.
     CAddrInfo SelectTriedCollision()
     {
-        CAddrInfo ret;
-        {
-            LOCK(cs);
-            Check();
-            ret = SelectTriedCollision_();
-            Check();
-        }
+        LOCK(cs);
+        Check();
+        const CAddrInfo ret = SelectTriedCollision_();
+        Check();
         return ret;
     }
 
@@ -566,13 +563,10 @@ class CAddrMan
      */
     CAddrInfo Select(bool newOnly = false)
     {
-        CAddrInfo addrRet;
-        {
-            LOCK(cs);
-            Check();
-            addrRet = Select_(newOnly);
-            Check();
-        }
+        LOCK(cs);
+        Check();
+        const CAddrInfo addrRet = Select_(newOnly);
+        Check();
         return addrRet;
     }
 
