Use block generator from consensus in TestService

Author: Łukasz Gąsior

src/main/scala/io/iohk/ethereum/jsonrpc/TestService.scala

@@ -6,7 +6,7 @@ import io.iohk.ethereum.blockchain.data.{AllocAccount, GenesisData, GenesisDataL
 import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.consensus.blocks._
 import io.iohk.ethereum.domain.{Address, Block, BlockchainImpl, UInt256}
-import io.iohk.ethereum.testmode.TestLedgerWrapper
+import io.iohk.ethereum.testmode.{TestLedgerWrapper, TestmodeConsensus}
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.transactions.PendingTransactionsManager.PendingTransactionsResponse
 import io.iohk.ethereum.utils.{BlockchainConfig, DaoForkConfig, Logger, MonetaryPolicyConfig}
@@ -52,14 +52,14 @@ class TestService(
     blockchain: BlockchainImpl,
     pendingTransactionsManager: ActorRef,
     consensusConfig: ConsensusConfig,
+    consensus: TestmodeConsensus,
     testLedgerWrapper: TestLedgerWrapper)
   extends Logger {
 
   import TestService._
   import akka.pattern.ask
 
   private var etherbase: Address = consensusConfig.coinbase
-  private var testBlockTimestamp: Long = System.currentTimeMillis()
 
   def setChainParams(request: SetChainParamsRequest): ServiceResponse[SetChainParamsResponse] = {
     val newBlockchainConfig = new BlockchainConfig {
@@ -111,7 +111,7 @@ class TestService(
         val res = testLedgerWrapper.ledger.importBlock(blockForMining.block)
         log.info("Block mining result: " + res)
         pendingTransactionsManager ! PendingTransactionsManager.ClearPendingTransactions
-        testBlockTimestamp += 1
+        consensus.blockTimestamp += 1
       }
     }
 
@@ -124,7 +124,7 @@ class TestService(
   }
 
   def modifyTimestamp(request: ModifyTimestampRequest): ServiceResponse[ModifyTimestampResponse] = {
-    testBlockTimestamp = request.timestamp
+    consensus.blockTimestamp = request.timestamp
     Future.successful(Right(ModifyTimestampResponse()))
   }
 
@@ -143,20 +143,12 @@ class TestService(
   }
 
   private def getBlockForMining(parentBlock: Block): Future[PendingBlock] = {
-    val blockGenerator =
-      new NoOmmersBlockGenerator(blockchain, testLedgerWrapper.blockchainConfig, consensusConfig, testLedgerWrapper.ledger.consensus.blockPreparator,
-        new BlockTimestampProvider {
-          override def getEpochSecond: Long = testBlockTimestamp
-        }) {
-      override def withBlockTimestampProvider(blockTimestampProvider: BlockTimestampProvider): TestBlockGenerator = this
-    }
-
     implicit val timeout = Timeout(5.seconds)
     (pendingTransactionsManager ? PendingTransactionsManager.GetPendingTransactions)
       .mapTo[PendingTransactionsResponse]
       .recover { case _ => PendingTransactionsResponse(Nil) }
       .flatMap { pendingTxs =>
-        blockGenerator.generateBlock(parentBlock, pendingTxs.pendingTransactions.map(_.stx), etherbase, Nil) match {
+        consensus.blockGenerator.generateBlock(parentBlock, pendingTxs.pendingTransactions.map(_.stx), etherbase, Nil) match {
           case Right(pb) => Future.successful(pb)
           case Left(err) => Future.failed(new RuntimeException(s"Error while generating block for mining: $err"))
         }

src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala

@@ -34,7 +34,7 @@ import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.transactions.PendingTransactionsManager
 import io.iohk.ethereum.ommers.OmmersPool
-import io.iohk.ethereum.testmode.TestLedgerBuilder
+import io.iohk.ethereum.testmode.{TestLedgerBuilder, TestmodeConsensusBuilder}
 import io.iohk.ethereum.utils.Config.SyncConfig
 
 import scala.util.{Failure, Success, Try}
@@ -297,10 +297,10 @@ trait TestServiceBuilder {
     ConsensusConfigBuilder with
     BlockchainConfigBuilder with
     VmBuilder with
-    ConsensusBuilder with
+    TestmodeConsensusBuilder with
     TestLedgerBuilder =>
 
-  lazy val testService = new TestService(blockchain, pendingTransactionsManager, consensusConfig, testLedgerWrapper)
+  lazy val testService = new TestService(blockchain, pendingTransactionsManager, consensusConfig, consensus, testLedgerWrapper)
 }
 
 trait EthServiceBuilder {

src/main/scala/io/iohk/ethereum/testmode/TestmodeConsensus.scala

@@ -2,8 +2,7 @@ package io.iohk.ethereum.testmode
 
 import akka.util.ByteString
 import io.iohk.ethereum.consensus._
-import io.iohk.ethereum.consensus.ethash.blocks.EthashBlockGeneratorImpl
-import io.iohk.ethereum.consensus.ethash.validators.{EthashValidators, OmmersValidator}
+import io.iohk.ethereum.consensus.blocks.{BlockTimestampProvider, NoOmmersBlockGenerator, TestBlockGenerator}
 import io.iohk.ethereum.consensus.validators._
 import io.iohk.ethereum.consensus.validators.std.{StdBlockValidator, StdSignedTransactionValidator}
 import io.iohk.ethereum.domain.{Block, BlockHeader, BlockchainImpl, Receipt}
@@ -17,17 +16,17 @@ class TestmodeConsensus(
     override val vm: VMImpl,
     blockchain: BlockchainImpl,
     blockchainConfig: BlockchainConfig,
-    consensusConfig: ConsensusConfig)
+    consensusConfig: ConsensusConfig,
+    var blockTimestamp: Long = 0) // var, because it can be modified by test_ RPC endpoints
   extends Consensus {
 
   override type Config = AnyRef
   override def protocol: Protocol = Protocol.Ethash
   override def config: FullConsensusConfig[AnyRef] = FullConsensusConfig[AnyRef](consensusConfig, "")
 
-  class TestValidators extends EthashValidators {
+  class TestValidators extends Validators {
     override def blockHeaderValidator: BlockHeaderValidator = (_, _) => Right(BlockHeaderValid)
     override def signedTransactionValidator: SignedTransactionValidator = new StdSignedTransactionValidator(blockchainConfig)
-    override def ommersValidator: OmmersValidator = (_, _, _, _, _) => Right(OmmersValidator.OmmersValid)
     override def validateBlockBeforeExecution(block: Block, getBlockHeaderByHash: GetBlockHeaderByHash, getNBlocksBack: GetNBlocksBack)
     : Either[BlockExecutionError.ValidationBeforeExecError, BlockExecutionSuccess] = Right(BlockExecutionSuccess)
     override def validateBlockAfterExecution(block: Block, stateRootHash: ByteString,receipts: Seq[Receipt], gasUsed: BigInt)
@@ -40,20 +39,21 @@ class TestmodeConsensus(
     }
   }
 
-  override def validators: EthashValidators = new TestValidators
+  override def validators: Validators = new TestValidators
 
   override val blockPreparator: BlockPreparator = new BlockPreparator(
     vm = vm,
     signedTxValidator = validators.signedTransactionValidator,
     blockchain = blockchain,
     blockchainConfig = blockchainConfig)
 
-  override val blockGenerator = new EthashBlockGeneratorImpl(
-    validators = validators,
-    blockchain = blockchain,
-    blockchainConfig = blockchainConfig,
-    consensusConfig = config.generic,
-    blockPreparator = blockPreparator)
+  override val blockGenerator =
+    new NoOmmersBlockGenerator(blockchain, blockchainConfig, consensusConfig, blockPreparator,
+      new BlockTimestampProvider {
+        override def getEpochSecond: Long = blockTimestamp
+      }) {
+      override def withBlockTimestampProvider(blockTimestampProvider: BlockTimestampProvider): TestBlockGenerator = this
+    }
 
   override def startProtocol(node: Node): Unit = {}
   override def stopProtocol(): Unit = {}