From 406bfc6418d33dec1856b4ef2fa3235ea6a60794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrzej=20Kope=C4=87?= <andrzej.kopec@iohk.io>
Date: Wed, 25 Nov 2020 14:40:14 +0100
Subject: [PATCH] [FIX] Fix NPE thrown during cake building

---
 .../scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala   | 1 +
 src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala | 4 ++--
 .../scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala b/src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala
index 6e6f983a21..f3f84622bf 100644
--- a/src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala
+++ b/src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala
@@ -55,6 +55,7 @@ trait StdConsensusBuilder extends ConsensusBuilder {
       config.protocol match {
         case Protocol.Ethash | Protocol.MockedPow | Protocol.RestrictedEthash => buildEthashConsensus()
       }
+
     log.info(s"Using '${protocol.name}' consensus [${consensus.getClass.getName}]")
 
     consensus
diff --git a/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala b/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
index 41dcff30e8..bda94ba34a 100644
--- a/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
+++ b/src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
@@ -285,7 +285,7 @@ trait TransactionHistoryServiceBuilder {
 object TransactionHistoryServiceBuilder {
   trait Default extends TransactionHistoryServiceBuilder {
     self: BlockchainBuilder with PendingTransactionsManagerBuilder with TxPoolConfigBuilder =>
-    val transactionHistoryService =
+    lazy val transactionHistoryService =
       new TransactionHistoryService(blockchain, pendingTransactionsManager, txPoolConfig.getTransactionFromPoolTimeout)
   }
 }
@@ -351,7 +351,7 @@ trait EthServiceBuilder {
     with JSONRpcConfigBuilder
     with AsyncConfigBuilder =>
 
-  val ethService = new EthService(
+  lazy val ethService = new EthService(
     blockchain,
     ledger,
     stxLedger,
diff --git a/src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala b/src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala
index 4930619a01..3c959183f1 100644
--- a/src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala
+++ b/src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala
@@ -67,7 +67,7 @@ class MantisServiceSpec
           )
         )
 
-        override val transactionHistoryService: TransactionHistoryService =
+        override lazy val transactionHistoryService: TransactionHistoryService =
           new TransactionHistoryService(
             blockchain,
             pendingTransactionsManager,