From: MASM fan <masmfan@gmail.com>
Date: Sun, 9 Feb 2014 17:01:05 +0000 (+0400)
Subject: Notifications clean up
X-Git-Tag: v0.4.4.6-nvc-update2~9
X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=commitdiff_plain;h=ecf1815faa0e16811c13f01b608336212b0b9070

Notifications clean up
---

diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
index 65451d1..fbeed5a 100644
--- a/src/checkpoints.cpp
+++ b/src/checkpoints.cpp
@@ -356,16 +356,6 @@ namespace Checkpoints
         return (nBestHeight >= pindexSync->nHeight + nCoinbaseMaturity ||
                 pindexSync->GetBlockTime() + nStakeMinAge < GetAdjustedTime());
     }
-
-    // Is the sync-checkpoint too old?
-    bool IsSyncCheckpointTooOld(unsigned int nSeconds)
-    {
-        LOCK(cs_hashSyncCheckpoint);
-        // sync-checkpoint should always be accepted block
-        assert(mapBlockIndex.count(hashSyncCheckpoint));
-        const CBlockIndex* pindexSync = mapBlockIndex[hashSyncCheckpoint];
-        return (pindexSync->GetBlockTime() + nSeconds < GetAdjustedTime());
-    }
 }
 
 // ppcoin: sync-checkpoint master key
diff --git a/src/checkpoints.h b/src/checkpoints.h
index fedcf36..c352894 100644
--- a/src/checkpoints.h
+++ b/src/checkpoints.h
@@ -64,7 +64,6 @@ namespace Checkpoints
     bool SetCheckpointPrivKey(std::string strPrivKey);
     bool SendSyncCheckpoint(uint256 hashCheckpoint);
     bool IsMatureSyncCheckpoint();
-    bool IsSyncCheckpointTooOld(unsigned int nSeconds);
 }
 
 // ppcoin: synchronized checkpoint
diff --git a/src/main.cpp b/src/main.cpp
index ca9351f..6e7d2a4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2940,7 +2940,7 @@ string GetWarnings(string strFor)
     if (GetBoolArg("-testsafemode"))
         strRPC = "test";
 
-    // ppcoin: wallet lock warning for minting
+    // wallet lock warning for minting
     if (strMintWarning != "")
     {
         nPriority = 0;
@@ -2954,17 +2954,7 @@ string GetWarnings(string strFor)
         strStatusBar = strMiscWarning;
     }
 
-    // * Should not enter safe mode for longer invalid chain
-    // * If sync-checkpoint is too old do not enter safe mode
-    // * Display warning only in the STRICT mode
-    if (CheckpointsMode == Checkpoints::STRICT && Checkpoints::IsSyncCheckpointTooOld(60 * 60 * 24 * 10) &&
-        !fTestNet && !IsInitialBlockDownload())
-    {
-        nPriority = 100;
-        strStatusBar = _("WARNING: Checkpoint is too old. Wait for block chain to download, or notify developers.");
-    }
-
-    // ppcoin: if detected invalid checkpoint enter safe mode
+    // if detected invalid checkpoint enter safe mode
     if (Checkpoints::hashInvalidCheckpoint != 0)
     {
         nPriority = 3000;