Rename Interval() to DifficultyAdjustmentInterval()

shaulkf · shaulkf · commit e5ece053da70 · 2015-02-17T08:46:51.000-05:00
diff --git a/src/chainparams.h b/src/chainparams.h
@@ -68,7 +68,7 @@ class CChainParams
     bool RequireStandard() const { return fRequireStandard; }
     int64_t TargetTimespan() const { return nTargetTimespan; }
     int64_t TargetSpacing() const { return nTargetSpacing; }
-    int64_t Interval() const { return nTargetTimespan / nTargetSpacing; }
+    int64_t DifficultyAdjustmentInterval() const { return nTargetTimespan / nTargetSpacing; }
     /** Make miner stop after a block is found. In RPC, don't return until nGenProcLimit blocks are generated */
     bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
     /** In the future use NetworkIDString() for RPC fields */
diff --git a/src/pow.cpp b/src/pow.cpp
@@ -20,8 +20,8 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
     if (pindexLast == NULL)
         return nProofOfWorkLimit;
 
-    // Only change once per interval
-    if ((pindexLast->nHeight+1) % Params().Interval() != 0)
+    // Only change once per difficulty adjustment interval
+    if ((pindexLast->nHeight+1) % Params().DifficultyAdjustmentInterval() != 0)
     {
         if (Params().AllowMinDifficultyBlocks())
         {
@@ -34,7 +34,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
             {
                 // Return the last non-special-min-difficulty-rules-block
                 const CBlockIndex* pindex = pindexLast;
-                while (pindex->pprev && pindex->nHeight % Params().Interval() != 0 && pindex->nBits == nProofOfWorkLimit)
+                while (pindex->pprev && pindex->nHeight % Params().DifficultyAdjustmentInterval() != 0 && pindex->nBits == nProofOfWorkLimit)
                     pindex = pindex->pprev;
                 return pindex->nBits;
             }
@@ -44,7 +44,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
 
     // Go back by what we want to be 14 days worth of blocks
     const CBlockIndex* pindexFirst = pindexLast;
-    for (int i = 0; pindexFirst && i < Params().Interval()-1; i++)
+    for (int i = 0; pindexFirst && i < Params().DifficultyAdjustmentInterval()-1; i++)
         pindexFirst = pindexFirst->pprev;
     assert(pindexFirst);
 
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -44,7 +44,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().Interval() + 1;
+        lookup = pb->nHeight % Params().DifficultyAdjustmentInterval() + 1;
 
     // If lookup is larger than chain, then set it to chain length.
     if (lookup > pb->nHeight)

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead`
`20`	`20`	`if (pindexLast == NULL)`
`21`	`21`	`return nProofOfWorkLimit;`
`22`	`22`
`23`		`- // Only change once per interval`
`24`		`- if ((pindexLast->nHeight+1) % Params().Interval() != 0)`
	`23`	`+ // Only change once per difficulty adjustment interval`
	`24`	`+ if ((pindexLast->nHeight+1) % Params().DifficultyAdjustmentInterval() != 0)`
`25`	`25`	`{`
`26`	`26`	`if (Params().AllowMinDifficultyBlocks())`
`27`	`27`	`{`
`@@ -34,7 +34,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead`
`34`	`34`	`{`
`35`	`35`	`// Return the last non-special-min-difficulty-rules-block`
`36`	`36`	`const CBlockIndex* pindex = pindexLast;`
`37`		`- while (pindex->pprev && pindex->nHeight % Params().Interval() != 0 && pindex->nBits == nProofOfWorkLimit)`
	`37`	`+ while (pindex->pprev && pindex->nHeight % Params().DifficultyAdjustmentInterval() != 0 && pindex->nBits == nProofOfWorkLimit)`
`38`	`38`	`pindex = pindex->pprev;`
`39`	`39`	`return pindex->nBits;`
`40`	`40`	`}`
`@@ -44,7 +44,7 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead`
`44`	`44`
`45`	`45`	`// Go back by what we want to be 14 days worth of blocks`
`46`	`46`	`const CBlockIndex* pindexFirst = pindexLast;`
`47`		`- for (int i = 0; pindexFirst && i < Params().Interval()-1; i++)`
	`47`	`+ for (int i = 0; pindexFirst && i < Params().DifficultyAdjustmentInterval()-1; i++)`
`48`	`48`	`pindexFirst = pindexFirst->pprev;`
`49`	`49`	`assert(pindexFirst);`
`50`	`50`