Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Fix NPE thrown during cake building #813

Merged
merged 1 commit into from
Nov 25, 2020
Merged

[FIX] Fix NPE thrown during cake building #813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/scala/io/iohk/ethereum/consensus/ConsensusBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/io/iohk/ethereum/nodebuilder/NodeBuilder.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -351,7 +351,7 @@ trait EthServiceBuilder {
with JSONRpcConfigBuilder
with AsyncConfigBuilder =>

val ethService = new EthService(
lazy val ethService = new EthService(
blockchain,
ledger,
stxLedger,
Expand Down
2 changes: 1 addition & 1 deletion src/test/scala/io/iohk/ethereum/jsonrpc/MantisServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ class MantisServiceSpec
)
)

override val transactionHistoryService: TransactionHistoryService =
override lazy val transactionHistoryService: TransactionHistoryService =
new TransactionHistoryService(
blockchain,
pendingTransactionsManager,
Expand Down