Use history.averageDelay() to het average time between blocks

input-output-hk · Jun 3, 2016 · db2b41b · db2b41b
1 parent 07a5489
commit db2b41b
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/scorex-consensus/src/main/scala/scorex/consensus/nxt/NxtLikeConsensusModule.scala b/scorex-consensus/src/main/scala/scorex/consensus/nxt/NxtLikeConsensusModule.scala
@@ -125,11 +125,8 @@ class NxtLikeConsensusModule(AvgDelay: Duration = 5.seconds)
     val height = history.heightOf(prevBlock).get
     val prevBaseTarget = consensusBlockData(prevBlock).baseTarget
     if (height % 2 == 0) {
-      val blocktimeAverage = (if (height > AvgBlockTimeDepth) {
-        (timestamp - history.parent(prevBlock, AvgBlockTimeDepth - 1).get.timestampField.value) / AvgBlockTimeDepth
-      } else {
-        timestamp - prevBlock.timestampField.value
-      }) / 1000
+      val blocktimeAverage = history.averageDelay(prevBlock, AvgBlockTimeDepth)
+        .getOrElse(timestamp - prevBlock.timestampField.value) / 1000
 
       val baseTarget = (if (blocktimeAverage > AvgDelayInSeconds) {
         (prevBaseTarget * Math.min(blocktimeAverage, MaxBlocktimeLimit)) / AvgDelayInSeconds