Merge pull request #337 from rnicoll/upstream

Clarified label on constant containing difficulty change interval.

Simple nomenclature change.
This commit is contained in:
voidref 2014-03-19 01:17:17 -07:00
commit 9e388f8e64

View file

@ -12,7 +12,8 @@
using namespace json_spirit;
using namespace std;
static const int kLookupSpanMod = 240;
// Number of blocks between difficulty changes
static const int kDifficultyChangeInterval = 240;
// Return average network hashes per second based on the last 'lookup' blocks,
// or from the last difficulty change if 'lookup' is nonpositive.
@ -28,7 +29,7 @@ Value GetNetworkHashPS(int lookup, int height) {
// If lookup is -1, then use blocks since last difficulty change.
if (lookup <= 0)
lookup = pb->nHeight % kLookupSpanMod + 1;
lookup = pb->nHeight % kDifficultyChangeInterval + 1;
// If lookup is larger than chain, then set it to chain length.
if (lookup > pb->nHeight)