Remove GetTotalBlocksEstimate and checkpoint tests that test nothing.

gmaxwell · gmaxwell · commit 5b93eeebb4f7 · 2016-12-06T17:16:13.000Z
GetTotalBlocksEstimate is no longer used and it was the only thing the checkpoint tests were testing. Since checkpoints are on their way out it makes more sense to remove the test file than to cook up a new pointless test. Github-Pull: bitcoin#9053 Rebased-From: 2082b55
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
@@ -50,7 +50,6 @@ BITCOIN_TESTS =\
   test/bip32_tests.cpp \
   test/blockencodings_tests.cpp \
   test/bloom_tests.cpp \
-  test/Checkpoints_tests.cpp \
   test/coins_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp
@@ -55,16 +55,6 @@ namespace Checkpoints {
         return fWorkBefore / (fWorkBefore + fWorkAfter);
     }
 
-    int GetTotalBlocksEstimate(const CCheckpointData& data)
-    {
-        const MapCheckpoints& checkpoints = data.mapCheckpoints;
-
-        if (checkpoints.empty())
-            return 0;
-
-        return checkpoints.rbegin()->first;
-    }
-
     CBlockIndex* GetLastCheckpoint(const CCheckpointData& data)
     {
         const MapCheckpoints& checkpoints = data.mapCheckpoints;
diff --git a/src/checkpoints.h b/src/checkpoints.h
@@ -19,9 +19,6 @@ struct CCheckpointData;
 namespace Checkpoints
 {
 
-//! Return conservative estimate of total number of blocks, 0 if unknown
-int GetTotalBlocksEstimate(const CCheckpointData& data);
-
 //! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint
 CBlockIndex* GetLastCheckpoint(const CCheckpointData& data);
 
diff --git a/src/test/Checkpoints_tests.cpp b/src/test/Checkpoints_tests.cpp

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,6 @@ struct CCheckpointData;`
`19`	`19`	`namespace Checkpoints`
`20`	`20`	`{`
`21`	`21`
`22`		`-//! Return conservative estimate of total number of blocks, 0 if unknown`
`23`		`-int GetTotalBlocksEstimate(const CCheckpointData& data);`
`24`		`-`
`25`	`22`	`//! Returns last CBlockIndex* in mapBlockIndex that is a checkpoint`
`26`	`23`	`CBlockIndex* GetLastCheckpoint(const CCheckpointData& data);`
`27`	`24`