X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Finit.cpp;h=08013119d8d0205ea36db17a8215f43dcac276c5;hp=a636b6e32d8b41eed9807435080bad2278f5aa98;hb=27ce22da0815f4c1fa0e949cc4740e3f4dd1ea9c;hpb=32b53bb54ee7591fd47dd1ee24e05b73337f40b5

diff --git a/src/init.cpp b/src/init.cpp
index a636b6e..0801311 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -38,7 +38,6 @@ enum Checkpoints::CPMode CheckpointsMode;
 
 // Ping and address broadcast intervals
 extern int64_t nPingInterval;
-extern int64_t nBroadcastInterval;
 extern int64_t nReserveBalance;
 
 //////////////////////////////////////////////////////////////////////////////
@@ -376,13 +375,12 @@ bool AppInit2()
 
     // ********************************************************* Step 2: parameter interactions
 
-    nNodeLifespan = (unsigned int)(GetArg("-addrlifespan", 7));
+    nNodeLifespan = GetArgUInt("-addrlifespan", 7);
     fUseFastIndex = GetBoolArg("-fastindex", true);
     fUseMemoryLog = GetBoolArg("-memorylog", true);
 
     // Ping and address broadcast intervals
     nPingInterval = max<int64_t>(10 * 60, GetArg("-keepalive", 30 * 60));
-    nBroadcastInterval = max<int64_t>(6 * nOneHour, GetArg("-addrsetlifetime", nOneDay));
 
     CheckpointsMode = Checkpoints::STRICT;
     std::string strCpMode = GetArg("-cppolicy", "strict");
@@ -780,8 +778,7 @@ bool AppInit2()
                     strLoadError = _("Error loading block database");
                     break;
                 }
-            } catch(std::exception &e) {
-                (void)e;
+            } catch(const std::exception&) {
                 strLoadError = _("Error opening block database");
                 break;
             }
@@ -1001,7 +998,7 @@ bool AppInit2()
 
     // ********************************************************* Step 13: IP collection thread
     strCollectorCommand = GetArg("-peercollector", "");
-    if (strCollectorCommand != "")
+    if (!fTestNet && strCollectorCommand != "")
         NewThread(ThreadIPCollector, NULL);
     // ********************************************************* Step 14: finished