[ETCM-135] Revert lazy vals in favor of vals

Author: kapke

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

@@ -25,7 +25,14 @@ import io.iohk.ethereum.network.p2p.EthereumMessageDecoder
 import io.iohk.ethereum.network.p2p.messages.CommonMessages.NewBlock
 import io.iohk.ethereum.network.rlpx.AuthHandshaker
 import io.iohk.ethereum.network.rlpx.RLPxConnectionHandler.RLPxConfiguration
-import io.iohk.ethereum.network.{EtcPeerManagerActor, ForkResolver, KnownNodesManager, PeerEventBusActor, PeerManagerActor, ServerActor}
+import io.iohk.ethereum.network.{
+  EtcPeerManagerActor,
+  ForkResolver,
+  KnownNodesManager,
+  PeerEventBusActor,
+  PeerManagerActor,
+  ServerActor
+}
 import io.iohk.ethereum.nodebuilder.{PruningConfigBuilder, SecureRandomBuilder}
 import io.iohk.ethereum.sync.util.SyncCommonItSpec._
 import io.iohk.ethereum.sync.util.SyncCommonItSpecUtils._

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

@@ -280,9 +280,14 @@ object PendingTransactionsManagerBuilder {
 }
 
 trait TransactionHistoryServiceBuilder {
-  self: BlockchainBuilder with PendingTransactionsManagerBuilder with TxPoolConfigBuilder =>
-  lazy val transactionHistoryService =
-    new TransactionHistoryService(blockchain, pendingTransactionsManager, txPoolConfig.getTransactionFromPoolTimeout)
+  def transactionHistoryService: TransactionHistoryService
+}
+object TransactionHistoryServiceBuilder {
+  trait Default extends TransactionHistoryServiceBuilder {
+    self: BlockchainBuilder with PendingTransactionsManagerBuilder with TxPoolConfigBuilder =>
+    val transactionHistoryService =
+      new TransactionHistoryService(blockchain, pendingTransactionsManager, txPoolConfig.getTransactionFromPoolTimeout)
+  }
 }
 
 trait FilterManagerBuilder {
@@ -346,7 +351,7 @@ trait EthServiceBuilder {
     with JSONRpcConfigBuilder
     with AsyncConfigBuilder =>
 
-  lazy val ethService = new EthService(
+  val ethService = new EthService(
     blockchain,
     ledger,
     stxLedger,
@@ -685,4 +690,4 @@ trait Node
     with KeyStoreConfigBuilder
     with AsyncConfigBuilder
     with CheckpointBlockGeneratorBuilder
-    with TransactionHistoryServiceBuilder
+    with TransactionHistoryServiceBuilder.Default

src/test/scala/io/iohk/ethereum/blockchain/sync/StateSyncSpec.scala

@@ -9,7 +9,13 @@ import akka.testkit.{TestKit, TestProbe}
 import akka.util.ByteString
 import io.iohk.ethereum.blockchain.sync.StateSyncUtils.{MptNodeData, TrieProvider}
 import io.iohk.ethereum.blockchain.sync.fast.{SyncStateScheduler, SyncStateSchedulerActor}
-import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.{RestartRequested, StartSyncingTo, StateSyncFinished, StateSyncStats, WaitingForNewTargetBlock}
+import io.iohk.ethereum.blockchain.sync.fast.SyncStateSchedulerActor.{
+  RestartRequested,
+  StartSyncingTo,
+  StateSyncFinished,
+  StateSyncStats,
+  WaitingForNewTargetBlock
+}
 import io.iohk.ethereum.db.dataSource.RocksDbDataSource.IterationError
 import io.iohk.ethereum.domain.{Address, BlockchainImpl, ChainWeight}
 import io.iohk.ethereum.network.EtcPeerManagerActor.{GetHandshakedPeers, HandshakedPeers, PeerInfo, SendMessage}

src/test/scala/io/iohk/ethereum/domain/BlockchainSpec.scala

@@ -154,15 +154,17 @@ class BlockchainSpec extends AnyFlatSpec with Matchers with ScalaCheckPropertyCh
       }
 
       blockchainWithStubPersisting.getBestBlockNumber() shouldBe blocksToImport.last.number
-      blockchainStoragesWithStubPersisting.appStateStorage.getBestBlockNumber() shouldBe blockImportToPersist.fold(0: BigInt)(_.number)
-
+      blockchainStoragesWithStubPersisting.appStateStorage.getBestBlockNumber() shouldBe blockImportToPersist.fold(
+        0: BigInt
+      )(_.number)
 
       // Rollback blocks
       val numberBlocksToRollback = intGen(0, numberBlocksToImport).sample.get
       val (blocksNotRollbacked, blocksToRollback) = blocksToImport.splitAt(numberBlocksToRollback)
 
       // Randomly select the block rollback to persist (empty means no persistance)
-      val blockRollbackToPersist = if (blocksToRollback.isEmpty) None else Gen.option(Gen.oneOf(blocksToRollback)).sample.get
+      val blockRollbackToPersist =
+        if (blocksToRollback.isEmpty) None else Gen.option(Gen.oneOf(blocksToRollback)).sample.get
       (stubStateStorage
         .onBlockRollback(_: BigInt, _: BigInt)(_: () => Unit))
         .when(*, *, *)
@@ -188,14 +190,18 @@ class BlockchainSpec extends AnyFlatSpec with Matchers with ScalaCheckPropertyCh
   trait TestSetup extends MockFactory {
     val maxNumberBlocksToImport: Int = 30
 
-    def calculatePersistedBestBlock(blockImportPersisted: Option[BigInt], blockRollbackPersisted: Option[BigInt], blocksRollbacked: Seq[BigInt]): BigInt = {
+    def calculatePersistedBestBlock(
+        blockImportPersisted: Option[BigInt],
+        blockRollbackPersisted: Option[BigInt],
+        blocksRollbacked: Seq[BigInt]
+    ): BigInt = {
       (blocksRollbacked, blockImportPersisted) match {
         case (Nil, Some(bi)) =>
           // No blocks rollbacked, last persist was the persist during import
           bi
         case (nonEmptyRollbackedBlocks, Some(bi)) =>
           // Last forced persist during apply/rollback
-          val maxForcedPersist = blockRollbackPersisted.fold(bi){ br => (br - 1).max(bi)}
+          val maxForcedPersist = blockRollbackPersisted.fold(bi) { br => (br - 1).max(bi) }
 
           // The above number would have been decreased by any rollbacked blocks
           (nonEmptyRollbackedBlocks.head - 1).min(maxForcedPersist)

src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala

@@ -28,7 +28,7 @@ class MantisServiceSpec
     with SpecFixtures
     with WithActorSystemShutDown {
   class Fixture
-      extends TransactionHistoryServiceBuilder
+      extends TransactionHistoryServiceBuilder.Default
       with EphemBlockchainTestSetup
       with PendingTransactionsManagerBuilder
       with TxPoolConfigBuilder
@@ -67,7 +67,7 @@ class MantisServiceSpec
           )
         )
 
-        override lazy val transactionHistoryService: TransactionHistoryService =
+        override val transactionHistoryService: TransactionHistoryService =
           new TransactionHistoryService(
             blockchain,
             pendingTransactionsManager,

src/test/scala/io/iohk/ethereum/utils/VersionInfoSpec.scala

@@ -7,7 +7,8 @@ class VersionInfoSpec extends AnyFlatSpec with Matchers {
   behavior of "nodeName"
 
   it should "match ethstats expected structure and preserve major and minor Java version" in {
-    VersionInfo.nodeName() should fullyMatch regex """mantis/v\d(\.\d+)*-[a-z0-9]{7}/[^/]+-[^/]+/[^/]+-.[^/]+-java-\d+\.\d+[._0-9]*"""
+    VersionInfo
+      .nodeName() should fullyMatch regex """mantis/v\d(\.\d+)*-[a-z0-9]{7}/[^/]+-[^/]+/[^/]+-.[^/]+-java-\d+\.\d+[._0-9]*"""
   }
 
   it should "augment the name with an identity" in {