remove ecip1099ActivationBlock parameter from EthashDAGManager

Author: Jaap van der Plas

src/main/scala/io/iohk/ethereum/consensus/pow/EthashDAGManager.scala

@@ -13,11 +13,11 @@ class EthashDAGManager(blockCreator: EthashBlockCreator) extends Logger {
   var currentEpochDagSize: Option[Long] = None
   var currentEpochDag: Option[Array[Array[Int]]] = None
 
-  def calculateDagSize(blockNumber: Long, epoch: Long, ecip1099ActivationBlock: Long): (Array[Array[Int]], Long) = {
+  def calculateDagSize(blockNumber: Long, epoch: Long): (Array[Array[Int]], Long) = {
     (currentEpoch, currentEpochDag, currentEpochDagSize) match {
       case (Some(`epoch`), Some(dag), Some(dagSize)) => (dag, dagSize)
       case _ =>
-        val seed = EthashUtils.seed(blockNumber, ecip1099ActivationBlock)
+        val seed = EthashUtils.seed(blockNumber, blockCreator.blockchainConfig.ecip1099BlockNumber.toLong)
         val dagSize = EthashUtils.dagSize(epoch)
         val dagNumHashes = (dagSize / EthashUtils.HASH_BYTES).toInt
         val dag =

src/main/scala/io/iohk/ethereum/consensus/pow/EthashMiner.scala

@@ -100,8 +100,7 @@ class EthashMiner(
   private def doEthashMining(blockNumber: Long, block: Block): (Long, MiningResult) = {
     val epoch =
       EthashUtils.epoch(blockNumber, blockCreator.blockchainConfig.ecip1099BlockNumber.toLong)
-    val (dag, dagSize) =
-      dagManager.calculateDagSize(blockNumber, epoch, blockCreator.blockchainConfig.ecip1099BlockNumber.toLong)
+    val (dag, dagSize) = dagManager.calculateDagSize(blockNumber, epoch)
     val headerHash = crypto.kec256(BlockHeader.getEncodedWithoutNonce(block.header))
     val startTime = System.nanoTime()
     val mineResult =