Merge pull request #1198 from jgarzik/addrman

Replace BDB-managed addr.dat with bitcoin-managed peers.dat

1 files changed, 9 insertions, 3 deletions

diff --git a/src/init.cpp b/src/init.cpp
index 9b12ab0aa4..2a3e407e86 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -371,9 +371,15 @@ bool AppInit2()
     InitMessage(_("Loading addresses..."));
     printf("Loading addresses...\n");
     nStart = GetTimeMillis();
-    if (!LoadAddresses())
-        strErrors << _("Error loading addr.dat") << "\n";
-    printf(" addresses   %15"PRI64d"ms\n", GetTimeMillis() - nStart);
+
+    {
+        CAddrDB adb;
+        if (!adb.Read(addrman))
+            printf("Invalid or missing peers.dat; recreating\n");
+    }
+
+    printf("Loaded %i addresses from peers.dat  %"PRI64d"ms\n",
+           addrman.size(), GetTimeMillis() - nStart);
 
     InitMessage(_("Loading block index..."));
     printf("Loading block index...\n");