remove TestBlockchainBuilder as it does not have any specific behaviour now

Author: Aurélien Richez

src/main/scala/io/iohk/ethereum/blockchain/sync/regular/RegularSync.scala

@@ -10,6 +10,7 @@ import akka.actor.Scheduler
 import akka.actor.SupervisorStrategy
 import akka.actor.typed.scaladsl.adapter._
 import akka.actor.typed.{ActorRef => TypedActorRef}
+
 import io.iohk.ethereum.blockchain.sync.Blacklist
 import io.iohk.ethereum.blockchain.sync.SyncProtocol
 import io.iohk.ethereum.blockchain.sync.SyncProtocol.Status
@@ -19,8 +20,11 @@ import io.iohk.ethereum.blockchain.sync.regular.RegularSync.NewCheckpoint
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.ProgressProtocol
 import io.iohk.ethereum.blockchain.sync.regular.RegularSync.ProgressState
 import io.iohk.ethereum.consensus.validators.BlockValidator
-import io.iohk.ethereum.domain.{Block, Blockchain, BlockchainReader}
-import io.iohk.ethereum.ledger.{BlockImport, BranchResolution}
+import io.iohk.ethereum.domain.Block
+import io.iohk.ethereum.domain.Blockchain
+import io.iohk.ethereum.domain.BlockchainReader
+import io.iohk.ethereum.ledger.BlockImport
+import io.iohk.ethereum.ledger.BranchResolution
 import io.iohk.ethereum.utils.ByteStringUtils
 import io.iohk.ethereum.utils.Config.SyncConfig
 

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

@@ -12,8 +12,12 @@ import monix.execution.Scheduler
 import scala.concurrent.duration.DurationInt
 
 import io.iohk.ethereum.consensus.pow.PoWMiningCoordinator.CoordinatorProtocol
-import io.iohk.ethereum.consensus.pow.miners.{EthashDAGManager, EthashMiner, KeccakMiner, Miner}
-import io.iohk.ethereum.domain.{Block, Blockchain, BlockchainReader}
+import io.iohk.ethereum.consensus.pow.miners.EthashDAGManager
+import io.iohk.ethereum.consensus.pow.miners.EthashMiner
+import io.iohk.ethereum.consensus.pow.miners.KeccakMiner
+import io.iohk.ethereum.consensus.pow.miners.Miner
+import io.iohk.ethereum.domain.Block
+import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.jsonrpc.EthMiningService
 
 object PoWMiningCoordinator {

src/main/scala/io/iohk/ethereum/domain/BlockchainReader.scala

@@ -1,14 +1,13 @@
 package io.iohk.ethereum.domain
 
 import akka.util.ByteString
-import io.iohk.ethereum.db.storage.{
-  AppStateStorage,
-  BlockBodiesStorage,
-  BlockHeadersStorage,
-  BlockNumberMappingStorage,
-  ReceiptStorage,
-  StateStorage
-}
+
+import io.iohk.ethereum.db.storage.AppStateStorage
+import io.iohk.ethereum.db.storage.BlockBodiesStorage
+import io.iohk.ethereum.db.storage.BlockHeadersStorage
+import io.iohk.ethereum.db.storage.BlockNumberMappingStorage
+import io.iohk.ethereum.db.storage.ReceiptStorage
+import io.iohk.ethereum.db.storage.StateStorage
 import io.iohk.ethereum.mpt.MptNode
 import io.iohk.ethereum.utils.Logger
 

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

@@ -20,7 +20,9 @@ import io.iohk.ethereum.consensus.ConsensusConfig
 import io.iohk.ethereum.consensus.blocks.PendingBlockAndState
 import io.iohk.ethereum.consensus.pow.EthashUtils
 import io.iohk.ethereum.crypto.kec256
-import io.iohk.ethereum.domain.{Address, BlockHeader, BlockchainReader}
+import io.iohk.ethereum.domain.Address
+import io.iohk.ethereum.domain.BlockHeader
+import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.jsonrpc.AkkaTaskOps._
 import io.iohk.ethereum.jsonrpc.server.controllers.JsonRpcBaseController.JsonRpcConfig
 import io.iohk.ethereum.ommers.OmmersPool

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

@@ -12,7 +12,10 @@ import scala.util.Try
 
 import io.iohk.ethereum.crypto
 import io.iohk.ethereum.crypto.ECDSASignature
-import io.iohk.ethereum.domain.{Account, Address, Blockchain, BlockchainReader}
+import io.iohk.ethereum.domain.Account
+import io.iohk.ethereum.domain.Address
+import io.iohk.ethereum.domain.Blockchain
+import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.jsonrpc.AkkaTaskOps._
 import io.iohk.ethereum.jsonrpc.JsonRpcError._
 import io.iohk.ethereum.jsonrpc.PersonalService._

src/main/scala/io/iohk/ethereum/ledger/BlockQueue.scala

@@ -1,16 +1,13 @@
 package io.iohk.ethereum.ledger
 
 import akka.util.ByteString
-import io.iohk.ethereum.domain.{Block, Blockchain, BlockchainReader, ChainWeight}
-import io.iohk.ethereum.ledger.BlockQueue.{Leaf, QueuedBlock}
-import io.iohk.ethereum.utils.Config.SyncConfig
-import io.iohk.ethereum.utils.Logger
 
 import scala.annotation.tailrec
 import scala.jdk.CollectionConverters._
 
 import io.iohk.ethereum.domain.Block
 import io.iohk.ethereum.domain.Blockchain
+import io.iohk.ethereum.domain.BlockchainReader
 import io.iohk.ethereum.domain.ChainWeight
 import io.iohk.ethereum.ledger.BlockQueue.Leaf
 import io.iohk.ethereum.ledger.BlockQueue.QueuedBlock

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

@@ -58,7 +58,6 @@ import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.ommers.OmmersPool
 import io.iohk.ethereum.security.SSLContextBuilder
 import io.iohk.ethereum.security.SecureRandomBuilder
-import io.iohk.ethereum.testmode.TestBlockchainBuilder
 import io.iohk.ethereum.testmode.TestEthBlockServiceWrapper
 import io.iohk.ethereum.testmode.TestModeServiceBuilder
 import io.iohk.ethereum.testmode.TestmodeConsensusBuilder
@@ -185,6 +184,7 @@ trait BlockchainBuilder {
   lazy val blockchainWriter: BlockchainWriter = BlockchainWriter(storagesInstance.storages, blockchainMetadata)
   lazy val blockchain: BlockchainImpl = BlockchainImpl(storagesInstance.storages, blockchainReader, blockchainMetadata)
 }
+
 trait BlockQueueBuilder {
   self: BlockchainBuilder with SyncConfigBuilder =>
 
@@ -435,7 +435,7 @@ trait DebugServiceBuilder {
 }
 
 trait TestServiceBuilder {
-  self: TestBlockchainBuilder
+  self: BlockchainBuilder
     with PendingTransactionsManagerBuilder
     with ConsensusConfigBuilder
     with BlockchainConfigBuilder
@@ -460,7 +460,7 @@ trait TestServiceBuilder {
 }
 
 trait TestEthBlockServiceBuilder extends EthBlocksServiceBuilder {
-  self: TestBlockchainBuilder with TestModeServiceBuilder with ConsensusBuilder with BlockQueueBuilder =>
+  self: BlockchainBuilder with TestModeServiceBuilder with ConsensusBuilder with BlockQueueBuilder =>
   override lazy val ethBlocksService =
     new TestEthBlockServiceWrapper(blockchain, blockchainReader, consensus, blockQueue)
 }

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

@@ -13,7 +13,6 @@ import io.iohk.ethereum.metrics.MetricsConfig
 import io.iohk.ethereum.network.PeerManagerActor
 import io.iohk.ethereum.network.ServerActor
 import io.iohk.ethereum.network.discovery.PeerDiscoveryManager
-import io.iohk.ethereum.testmode.TestBlockchainBuilder
 import io.iohk.ethereum.testmode.TestModeServiceBuilder
 import io.iohk.ethereum.testmode.TestmodeConsensusBuilder
 import io.iohk.ethereum.utils.Config
@@ -114,4 +113,4 @@ class TestNode
     with TestmodeConsensusBuilder
     with TestServiceBuilder
     with TestEthBlockServiceBuilder
-    with TestBlockchainBuilder
+    with BlockchainBuilder

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

@@ -12,7 +12,7 @@ import io.iohk.ethereum.nodebuilder._
 trait TestModeServiceBuilder extends StxLedgerBuilder {
   self: BlockchainConfigBuilder
     with StorageBuilder
-    with TestBlockchainBuilder
+    with BlockchainBuilder
     with SyncConfigBuilder
     with ConsensusBuilder
     with ActorSystemBuilder

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

@@ -130,11 +130,7 @@ class TestmodeConsensus(
 }
 
 trait TestmodeConsensusBuilder extends ConsensusBuilder {
-  self: VmBuilder
-    with TestBlockchainBuilder
-    with BlockchainConfigBuilder
-    with ConsensusConfigBuilder
-    with StorageBuilder =>
+  self: VmBuilder with BlockchainBuilder with BlockchainConfigBuilder with ConsensusConfigBuilder with StorageBuilder =>
 
   override lazy val consensus = new TestmodeConsensus(
     vm,