diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-04-03 11:50:29 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-04-03 11:51:02 +0200 |
| commit | 9bd1bdd08cd4e90f5004c40f2f3cee0f250b0811 (patch) | |
| tree | a650058b6950caf5d67dc468964b6eeeb158dc0c /src/checkpoints.cpp | |
| parent | Merge pull request #3842 from ditto-b/master (diff) | |
| parent | [Qt] rescan progress (diff) | |
| download | discoin-9bd1bdd08cd4e90f5004c40f2f3cee0f250b0811.tar.xz discoin-9bd1bdd08cd4e90f5004c40f2f3cee0f250b0811.zip | |
Merge pull request #3928
3927836 [Qt] rescan progress (Cozz Lovan)
Diffstat (limited to 'src/checkpoints.cpp')
| -rw-r--r-- | src/checkpoints.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/checkpoints.cpp b/src/checkpoints.cpp index 9db1f5e10..9ab8b6844 100644 --- a/src/checkpoints.cpp +++ b/src/checkpoints.cpp @@ -21,7 +21,7 @@ namespace Checkpoints // every system. When reindexing from a fast disk with a slow CPU, it // can be up to 20, while when downloading from a slow network with a // fast multicore CPU, it won't be much higher than 1. - static const double fSigcheckVerificationFactor = 5.0; + static const double SIGCHECK_VERIFICATION_FACTOR = 5.0; struct CCheckpointData { const MapCheckpoints *mapCheckpoints; @@ -104,12 +104,13 @@ namespace Checkpoints } // Guess how far we are in the verification process at the given block index - double GuessVerificationProgress(CBlockIndex *pindex) { + double GuessVerificationProgress(CBlockIndex *pindex, bool fSigchecks) { if (pindex==NULL) return 0.0; int64_t nNow = time(NULL); + double fSigcheckVerificationFactor = fSigchecks ? SIGCHECK_VERIFICATION_FACTOR : 1.0; double fWorkBefore = 0.0; // Amount of work done before pindex double fWorkAfter = 0.0; // Amount of work left after pindex (estimated) // Work is defined as: 1.0 per transaction before the last checkpoint, and |