Merge pull request #5999

e8e8904 Chainparams: Cleanup: Delete CChainParams getters to attributes from Consensus::Params (Jorge Timón)
This commit is contained in:
Wladimir J. van der Laan
2015-04-15 11:53:27 +02:00
3 changed files with 5 additions and 7 deletions

View File

@@ -45,7 +45,7 @@ Value GetNetworkHashPS(int lookup, int height) {
// If lookup is -1, then use blocks since last difficulty change.
if (lookup <= 0)
lookup = pb->nHeight % Params().DifficultyAdjustmentInterval() + 1;
lookup = pb->nHeight % Params().GetConsensus().DifficultyAdjustmentInterval() + 1;
// If lookup is larger than chain, then set it to chain length.
if (lookup > pb->nHeight)