From a4bac66cca62a5514579a15d198f3baa80683172 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 4 Jan 2017 07:09:02 -0800 Subject: [MOVEONLY] Move progress estimation out of checkpoints --- src/validation.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/validation.h') diff --git a/src/validation.h b/src/validation.h index 981f659633..0288e9163e 100644 --- a/src/validation.h +++ b/src/validation.h @@ -42,6 +42,7 @@ class CScriptCheck; class CTxMemPool; class CValidationInterface; class CValidationState; +class CCheckpointData; struct PrecomputedTransactionData; struct LockPoints; @@ -279,6 +280,9 @@ bool GetTransaction(const uint256 &hash, CTransactionRef &tx, const Consensus::P bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, std::shared_ptr pblock = std::shared_ptr()); CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); +/** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */ +double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true); + /** * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target. * The user sets the target (in MB) on the command line or in config file. This will be run on startup and whenever new -- cgit v1.2.3 From 3641141c8f9bdc68fcc0792ce8842a8e33ea7320 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 4 Jan 2017 07:31:56 -0800 Subject: Move tx estimation data out of CCheckPointData --- src/validation.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/validation.h') diff --git a/src/validation.h b/src/validation.h index 0288e9163e..7bde123bfe 100644 --- a/src/validation.h +++ b/src/validation.h @@ -42,7 +42,7 @@ class CScriptCheck; class CTxMemPool; class CValidationInterface; class CValidationState; -class CCheckpointData; +struct ChainTxData; struct PrecomputedTransactionData; struct LockPoints; @@ -281,7 +281,7 @@ bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */ -double GuessVerificationProgress(const CCheckpointData& data, CBlockIndex* pindex, bool fSigchecks = true); +double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex, bool fSigchecks = true); /** * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target. -- cgit v1.2.3 From 6dd81169fc33f0c9720afe0b9b52ed4539e59580 Mon Sep 17 00:00:00 2001 From: Pieter Wuille Date: Wed, 4 Jan 2017 13:09:20 -0800 Subject: Remove SIGCHECK_VERIFICATION_FACTOR --- src/validation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/validation.h') diff --git a/src/validation.h b/src/validation.h index 7bde123bfe..ebfff66ea1 100644 --- a/src/validation.h +++ b/src/validation.h @@ -281,7 +281,7 @@ bool ActivateBestChain(CValidationState& state, const CChainParams& chainparams, CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams); /** Guess verification progress (as a fraction between 0.0=genesis and 1.0=current tip). */ -double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex, bool fSigchecks = true); +double GuessVerificationProgress(const ChainTxData& data, CBlockIndex* pindex); /** * Prune block and undo files (blk???.dat and undo???.dat) so that the disk space used is less than a user-defined target. -- cgit v1.2.3