Browse Source

Replace repeated GetBoolArg() calls with Checkpoint::fEnabled variable

set once at init time.
tags/v0.15.1
Jeff Garzik 8 years ago
parent
commit
f0d8a52cc0
3 changed files with 9 additions and 3 deletions
  1. 5
    3
      src/checkpoints.cpp
  2. 2
    0
      src/checkpoints.h
  3. 2
    0
      src/init.cpp

+ 5
- 3
src/checkpoints.cpp View File

@@ -28,6 +28,8 @@ namespace Checkpoints
double fTransactionsPerDay;
};

bool fEnabled = true;

// What makes a good checkpoint block?
// + Is surrounded by blocks with reasonable timestamps
// (no blocks before with a timestamp after, none after with
@@ -74,7 +76,7 @@ namespace Checkpoints

bool CheckBlock(int nHeight, const uint256& hash)
{
if (!GetBoolArg("-checkpoints", true))
if (!fEnabled)
return true;

const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;
@@ -117,7 +119,7 @@ namespace Checkpoints

int GetTotalBlocksEstimate()
{
if (!GetBoolArg("-checkpoints", true))
if (!fEnabled)
return 0;

const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;
@@ -127,7 +129,7 @@ namespace Checkpoints

CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex)
{
if (!GetBoolArg("-checkpoints", true))
if (!fEnabled)
return NULL;

const MapCheckpoints& checkpoints = *Checkpoints().mapCheckpoints;

+ 2
- 0
src/checkpoints.h View File

@@ -24,6 +24,8 @@ namespace Checkpoints
CBlockIndex* GetLastCheckpoint(const std::map<uint256, CBlockIndex*>& mapBlockIndex);

double GuessVerificationProgress(CBlockIndex *pindex);

extern bool fEnabled;
}

#endif

+ 2
- 0
src/init.cpp View File

@@ -10,6 +10,7 @@
#include "init.h"
#include "util.h"
#include "ui_interface.h"
#include "checkpoints.h"

#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
@@ -493,6 +494,7 @@ bool AppInit2(boost::thread_group& threadGroup)
// ********************************************************* Step 2: parameter interactions

fTestNet = GetBoolArg("-testnet");
Checkpoints::fEnabled = GetBoolArg("-checkpoints", true);

if (mapArgs.count("-bind")) {
// when specifying an explicit binding address, you want to listen on it

Loading…
Cancel
Save