Mutable BlockchainConfig in TestNode (#1038)

Author: jvdp

src/it/scala/io/iohk/ethereum/ledger/BlockImporterItSpec.scala

@@ -27,14 +27,13 @@ import io.iohk.ethereum.blockchain.sync.regular.BlockImporter
 import io.iohk.ethereum.blockchain.sync.regular.BlockImporter.NewCheckpoint
 import io.iohk.ethereum.checkpointing.CheckpointingTestHelpers
 import io.iohk.ethereum.consensus.blocks.CheckpointBlockGenerator
-import io.iohk.ethereum.consensus.mining.GetBlockHeaderByHash
-import io.iohk.ethereum.consensus.mining.GetNBlocksBack
 import io.iohk.ethereum.consensus.pow.validators.OmmersValidator
 import io.iohk.ethereum.consensus.pow.validators.StdOmmersValidator
 import io.iohk.ethereum.consensus.validators.Validators
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.domain._
 import io.iohk.ethereum.mpt.MerklePatriciaTrie
+import io.iohk.ethereum.utils.BlockchainConfig
 import io.iohk.ethereum.utils.Config
 import io.iohk.ethereum.utils.Config.SyncConfig
 
@@ -67,7 +66,8 @@ class BlockImporterItSpec
         ommersPoolProbe.ref,
         broadcasterProbe.ref,
         pendingTransactionsManagerProbe.ref,
-        supervisor.ref
+        supervisor.ref,
+        this
       )
     )
 
@@ -180,7 +180,8 @@ class BlockImporterItSpec
         ommersPoolProbe.ref,
         broadcasterProbe.ref,
         pendingTransactionsManagerProbe.ref,
-        supervisor.ref
+        supervisor.ref,
+        this
       )
     )
 
@@ -232,15 +233,7 @@ class TestFixture extends TestSetupWithVmAndValidators {
   )
 
   override protected lazy val successValidators: Validators = new Mocks.MockValidatorsAlwaysSucceed {
-    override val ommersValidator: OmmersValidator = (
-        parentHash: ByteString,
-        blockNumber: BigInt,
-        ommers: Seq[BlockHeader],
-        getBlockHeaderByHash: GetBlockHeaderByHash,
-        getNBlocksBack: GetNBlocksBack
-    ) =>
-      new StdOmmersValidator(blockHeaderValidator)
-        .validate(parentHash, blockNumber, ommers, getBlockHeaderByHash, getNBlocksBack)
+    override val ommersValidator: OmmersValidator = new StdOmmersValidator(blockHeaderValidator)
   }
 
   override lazy val blockImport: BlockImport = mkBlockImport(
@@ -251,14 +244,13 @@ class TestFixture extends TestSetupWithVmAndValidators {
         blockchainReader,
         blockchainWriter,
         storagesInstance.storages.evmCodeStorage,
-        blockchainConfig,
         mining.blockPreparator,
         new BlockValidation(mining, blockchainReader, blockQueue)
       ) {
         override def executeAndValidateBlock(
             block: Block,
             alreadyValidated: Boolean = false
-        ): Either[BlockExecutionError, Seq[Receipt]] =
+        )(implicit blockchainConfig: BlockchainConfig): Either[BlockExecutionError, Seq[Receipt]] =
           Right(BlockResult(emptyWorld).receipts)
       }
     )
@@ -276,7 +268,8 @@ class TestFixture extends TestSetupWithVmAndValidators {
       ommersPoolProbe.ref,
       broadcasterProbe.ref,
       pendingTransactionsManagerProbe.ref,
-      supervisor.ref
+      supervisor.ref,
+      this
     )
   )
 

src/it/scala/io/iohk/ethereum/sync/util/CommonFakePeer.scala

@@ -63,6 +63,7 @@ import io.iohk.ethereum.network.handshaker.EtcHandshakerConfiguration
 import io.iohk.ethereum.network.handshaker.Handshaker
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
+import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.nodebuilder.PruningConfigBuilder
 import io.iohk.ethereum.security.SecureRandomBuilder
 import io.iohk.ethereum.sync.util.SyncCommonItSpec._
@@ -73,7 +74,8 @@ import io.iohk.ethereum.vm.EvmConfig
 
 abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCustomConfig)
     extends SecureRandomBuilder
-    with TestSyncConfig {
+    with TestSyncConfig
+    with BlockchainConfigBuilder {
   implicit val akkaTimeout: Timeout = Timeout(5.second)
 
   val config = Config.config
@@ -120,7 +122,7 @@ abstract class CommonFakePeer(peerName: String, fakePeerCustomConfig: FakePeerCu
       override lazy val dataSource: RocksDbDataSource =
         RocksDbDataSource(getRockDbTestConfig(tempDir.toAbsolutePath.toString), Namespaces.nsSeq)
     }
-  lazy val blockchainConfig = Config.blockchains.blockchainConfig
+  implicit override lazy val blockchainConfig: BlockchainConfig = Config.blockchains.blockchainConfig
   lazy val discoveryConfig: DiscoveryConfig = DiscoveryConfig(Config.config, blockchainConfig.bootstrapNodes)
 
   /** Default persist interval is 20s, which is too long for tests. As in all tests we treat peer as connected when

src/it/scala/io/iohk/ethereum/sync/util/FastSyncItSpecUtils.scala

@@ -45,7 +45,8 @@ object FastSyncItSpecUtils {
         etcPeerManager,
         blacklist,
         testSyncConfig,
-        system.scheduler
+        system.scheduler,
+        this
       )
     )
 

src/it/scala/io/iohk/ethereum/sync/util/RegularSyncItSpecUtils.scala

@@ -55,7 +55,9 @@ object RegularSyncItSpecUtils {
         stateRootHash: ByteString,
         receipts: Seq[Receipt],
         gasUsed: BigInt
-    ): Either[BlockExecutionError, BlockExecutionSuccess] = Right(BlockExecutionSuccess)
+    )(implicit blockchainConfig: BlockchainConfig): Either[BlockExecutionError, BlockExecutionSuccess] = Right(
+      BlockExecutionSuccess
+    )
   }
 
   object ValidatorsExecutorAlwaysSucceed extends ValidatorsExecutorAlwaysSucceed
@@ -74,7 +76,6 @@ object RegularSyncItSpecUtils {
           storagesInstance.storages.evmCodeStorage,
           bl,
           blockchainReader,
-          blockchainConfig,
           fullConfig,
           ValidatorsExecutorAlwaysSucceed,
           NoAdditionalPoWData
@@ -99,7 +100,6 @@ object RegularSyncItSpecUtils {
         blockchainReader,
         blockchainWriter,
         storagesInstance.storages.evmCodeStorage,
-        blockchainConfig,
         mining.blockPreparator,
         blockValidation
       )
@@ -154,7 +154,8 @@ object RegularSyncItSpecUtils {
         ommersPool,
         broadcasterRef,
         pendingTransactionsManager,
-        regularSync
+        regularSync,
+        this
       )
     )
 
@@ -173,7 +174,8 @@ object RegularSyncItSpecUtils {
         testSyncConfig,
         ommersPool,
         pendingTransactionsManager,
-        system.scheduler
+        system.scheduler,
+        this
       )
     )
 

src/it/scala/io/iohk/ethereum/txExecTest/ContractTest.scala

@@ -29,7 +29,6 @@ class ContractTest extends AnyFlatSpec with Matchers {
         blockchainReader,
         blockchainWriter,
         testBlockchainStorages.evmCodeStorage,
-        blockchainConfig,
         mining.blockPreparator,
         blockValidation
       )

src/it/scala/io/iohk/ethereum/txExecTest/ECIP1017Test.scala

@@ -23,7 +23,7 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
   val EraDuration = 3
 
   trait TestSetup extends ScenarioSetup {
-    override lazy val blockchainConfig: BlockchainConfig = BlockchainConfig(
+    implicit override lazy val blockchainConfig: BlockchainConfig = BlockchainConfig(
       monetaryPolicyConfig = MonetaryPolicyConfig(EraDuration, 0.2, 5000000000000000000L, 3000000000000000000L),
       // unused
       maxCodeSize = None,
@@ -91,7 +91,6 @@ class ECIP1017Test extends AnyFlatSpec with Matchers {
           blockchainReader,
           blockchainWriter,
           testBlockchainStorages.evmCodeStorage,
-          blockchainConfig,
           mining.blockPreparator,
           blockValidation
         )

src/it/scala/io/iohk/ethereum/txExecTest/ForksTest.scala

@@ -21,7 +21,7 @@ import io.iohk.ethereum.utils.MonetaryPolicyConfig
 class ForksTest extends AnyFlatSpec with Matchers {
 
   trait TestSetup extends ScenarioSetup {
-    override lazy val blockchainConfig: BlockchainConfig = BlockchainConfig(
+    implicit override lazy val blockchainConfig: BlockchainConfig = BlockchainConfig(
       forkBlockNumbers = ForkBlockNumbers(
         frontierBlockNumber = 0,
         homesteadBlockNumber = 3,
@@ -84,7 +84,6 @@ class ForksTest extends AnyFlatSpec with Matchers {
           blockchainReader,
           blockchainWriter,
           testBlockchainStorages.evmCodeStorage,
-          blockchainConfig,
           mining.blockPreparator,
           blockValidation
         )

src/main/scala/io/iohk/ethereum/blockchain/data/GenesisDataLoader.scala

@@ -38,8 +38,7 @@ import io.iohk.ethereum.utils.Logger
 class GenesisDataLoader(
     blockchainReader: BlockchainReader,
     blockchainWriter: BlockchainWriter,
-    stateStorage: StateStorage,
-    blockchainConfig: BlockchainConfig
+    stateStorage: StateStorage
 ) extends Logger {
 
   private val bloomLength = 512
@@ -49,9 +48,8 @@ class GenesisDataLoader(
   import Account._
 
   private val emptyTrieRootHash = ByteString(crypto.kec256(rlp.encode(Array.emptyByteArray)))
-  crypto.kec256(ByteString.empty)
 
-  def loadGenesisData(): Unit = {
+  def loadGenesisData()(implicit blockchainConfig: BlockchainConfig): Unit = {
     log.debug("Loading genesis data")
 
     val genesisJson = blockchainConfig.customGenesisJsonOpt.getOrElse {
@@ -89,7 +87,7 @@ class GenesisDataLoader(
     }
   }
 
-  private def loadGenesisData(genesisJson: String): Try[Unit] = {
+  private def loadGenesisData(genesisJson: String)(implicit blockchainConfig: BlockchainConfig): Try[Unit] = {
     import org.json4s.native.JsonMethods.parse
     implicit val formats: Formats = DefaultFormats + ByteStringJsonSerializer + UInt256JsonSerializer
     for {
@@ -98,7 +96,7 @@ class GenesisDataLoader(
     } yield ()
   }
 
-  def loadGenesisData(genesisData: GenesisData): Try[Unit] = {
+  def loadGenesisData(genesisData: GenesisData)(implicit blockchainConfig: BlockchainConfig): Try[Unit] = {
 
     val storage = stateStorage.getReadOnlyStorage
     val initalRootHash = MerklePatriciaTrie.EmptyRootHash
@@ -132,7 +130,9 @@ class GenesisDataLoader(
     }
   }
 
-  private def getGenesisStateRoot(genesisData: GenesisData, initalRootHash: Array[Byte], storage: MptStorage) = {
+  private def getGenesisStateRoot(genesisData: GenesisData, initalRootHash: Array[Byte], storage: MptStorage)(implicit
+      blockchainConfig: BlockchainConfig
+  ) = {
     import MerklePatriciaTrie.defaultByteArraySerializable
 
     genesisData.alloc.zipWithIndex.foldLeft(initalRootHash) { case (rootHash, ((address, genesisAccount), _)) =>

src/main/scala/io/iohk/ethereum/blockchain/sync/SyncController.scala

@@ -20,6 +20,7 @@ import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.domain.BlockchainWriter
 import io.iohk.ethereum.ledger.BlockImport
 import io.iohk.ethereum.ledger.BranchResolution
+import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.utils.Config.SyncConfig
 
 class SyncController(
@@ -39,6 +40,7 @@ class SyncController(
     etcPeerManager: ActorRef,
     blacklist: Blacklist,
     syncConfig: SyncConfig,
+    configBuilder: BlockchainConfigBuilder,
     externalSchedulerOpt: Option[Scheduler] = None
 ) extends Actor
     with ActorLogging {
@@ -105,7 +107,8 @@ class SyncController(
         etcPeerManager,
         blacklist,
         syncConfig,
-        scheduler
+        scheduler,
+        configBuilder
       ),
       "fast-sync"
     )
@@ -131,7 +134,8 @@ class SyncController(
         syncConfig,
         ommersPool,
         pendingTransactionsManager,
-        scheduler
+        scheduler,
+        configBuilder
       ),
       "regular-sync"
     )
@@ -159,7 +163,8 @@ object SyncController {
       ommersPool: ActorRef,
       etcPeerManager: ActorRef,
       blacklist: Blacklist,
-      syncConfig: SyncConfig
+      syncConfig: SyncConfig,
+      configBuilder: BlockchainConfigBuilder
   ): Props =
     Props(
       new SyncController(
@@ -178,7 +183,8 @@ object SyncController {
         ommersPool,
         etcPeerManager,
         blacklist,
-        syncConfig
+        syncConfig,
+        configBuilder
       )
     )
 }

src/main/scala/io/iohk/ethereum/blockchain/sync/fast/FastSync.scala

@@ -46,6 +46,7 @@ import io.iohk.ethereum.network.Peer
 import io.iohk.ethereum.network.p2p.messages.Codes
 import io.iohk.ethereum.network.p2p.messages.ETH62._
 import io.iohk.ethereum.network.p2p.messages.ETH63._
+import io.iohk.ethereum.nodebuilder.BlockchainConfigBuilder
 import io.iohk.ethereum.utils.ByteStringUtils
 import io.iohk.ethereum.utils.Config.SyncConfig
 
@@ -64,13 +65,15 @@ class FastSync(
     val etcPeerManager: ActorRef,
     val blacklist: Blacklist,
     val syncConfig: SyncConfig,
-    implicit val scheduler: Scheduler
+    implicit val scheduler: Scheduler,
+    configBuilder: BlockchainConfigBuilder
 ) extends Actor
     with ActorLogging
     with PeerListSupportNg
     with ReceiptsValidator
     with SyncBlocksValidator {
 
+  import configBuilder._
   import FastSync._
   import syncConfig._
 
@@ -1160,7 +1163,8 @@ object FastSync {
       etcPeerManager: ActorRef,
       blacklist: Blacklist,
       syncConfig: SyncConfig,
-      scheduler: Scheduler
+      scheduler: Scheduler,
+      configBuilder: BlockchainConfigBuilder
   ): Props =
     Props(
       new FastSync(
@@ -1177,7 +1181,8 @@ object FastSync {
         etcPeerManager,
         blacklist,
         syncConfig,
-        scheduler
+        scheduler,
+        configBuilder
       )
     )