Browse Source
Avoid introducing a virtual into CChainParams
Treat fSkipProofOfWorkCheck the same as other parameters.
pull/145/head
Wladimir J. van der Laan
10 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
2 changed files with
3 additions and
5 deletions
-
src/chainparams.cpp
-
src/chainparams.h
|
|
@ -115,6 +115,7 @@ public: |
|
|
|
fAllowMinDifficultyBlocks = false; |
|
|
|
fRequireStandard = true; |
|
|
|
fMineBlocksOnDemand = false; |
|
|
|
fSkipProofOfWorkCheck = false; |
|
|
|
} |
|
|
|
}; |
|
|
|
static CMainParams mainParams; |
|
|
@ -231,11 +232,7 @@ public: |
|
|
|
fDefaultCheckMemPool = true; |
|
|
|
fAllowMinDifficultyBlocks = false; |
|
|
|
fMineBlocksOnDemand = true; |
|
|
|
fSkipProofOfWorkCheck = false; |
|
|
|
} |
|
|
|
virtual bool SkipProofOfWorkCheck() const { return fSkipProofOfWorkCheck; } |
|
|
|
protected: |
|
|
|
bool fSkipProofOfWorkCheck; |
|
|
|
public: |
|
|
|
// Published setters to allow changing values in unit test cases
|
|
|
|
virtual void setSubsidyHalvingInterval(int anSubsidyHalvingInterval) { nSubsidyHalvingInterval=anSubsidyHalvingInterval; } |
|
|
|
|
|
@ -62,7 +62,7 @@ public: |
|
|
|
/* Allow mining of a min-difficulty block */ |
|
|
|
bool AllowMinDifficultyBlocks() const { return fAllowMinDifficultyBlocks; } |
|
|
|
/* Skip proof-of-work check: allow mining of any difficulty block */ |
|
|
|
virtual bool SkipProofOfWorkCheck() const { return false; } |
|
|
|
bool SkipProofOfWorkCheck() const { return fSkipProofOfWorkCheck; } |
|
|
|
/* Make standard checks */ |
|
|
|
bool RequireStandard() const { return fRequireStandard; } |
|
|
|
int64_t TargetTimespan() const { return nTargetTimespan; } |
|
|
@ -105,6 +105,7 @@ protected: |
|
|
|
bool fAllowMinDifficultyBlocks; |
|
|
|
bool fRequireStandard; |
|
|
|
bool fMineBlocksOnDemand; |
|
|
|
bool fSkipProofOfWorkCheck; |
|
|
|
}; |
|
|
|
|
|
|
|
/** Modifiable parameters interface is used by test cases to adapt the parameters in order
|
|
|
|