src/addrman.h

@@ -435,11 +435,11 @@ public:
     }
 
     template<typename Stream>
-    void Unserialize(Stream& s_) EXCLUSIVE_LOCKS_REQUIRED(!cs)
+    void Unserialize(Stream& s_)
     {
         LOCK(cs);
 
-        std::vector<int>().swap(vRandom);
+        assert(vRandom.empty());
 
         Format format;
         s_ >> Using<CustomUintFormatter<1>>(format);

src/net.cpp

@@ -2277,8 +2277,8 @@ void StartNode(boost::thread_group& threadGroup, CScheduler& scheduler)
     }
 
     uiInterface.InitMessage(_("Loading addresses..."));
+    // Load addresses for peers.dat
     int64_t nStart = GetTimeMillis();
-    fprintf(stderr, "%s: Loading addresses for peers.dat at %ld\n", __func__, nStart);
     {
         CAddrDB adb;
         if (!adb.Read(addrman))