Skip to content

Commit 51b967a

Browse files
author
Michal Mrozek
committed
[ETCM-301] PR fixes
1 parent 9792878 commit 51b967a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/main/scala/io/iohk/ethereum/consensus/ethash/MockedMiner.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@ class MockedMiner(
3737
mineBlocks.parentBlock match {
3838
case Some(parentHash) =>
3939
blockchain.getBlockByHash(parentHash) match {
40-
case Some(parentBlock) => mineBlock(mineBlocks, parentBlock)
40+
case Some(parentBlock) => startMiningBlocks(mineBlocks, parentBlock)
4141
case None =>
4242
val error = s"Unable to get parent block with hash ${ByteStringUtils.hash2string(parentHash)} for mining"
4343
sender() ! MiningError(error)
4444
}
4545
case None =>
4646
val parentBlock = blockchain.getBestBlock()
47-
mineBlock(mineBlocks, parentBlock)
47+
startMiningBlocks(mineBlocks, parentBlock)
4848
}
4949
}
5050

51-
private def mineBlock(mineBlocks: MineBlocks, parentBlock: Block) = {
51+
private def startMiningBlocks(mineBlocks: MineBlocks, parentBlock: Block) = {
5252
self ! MineBlock
5353
sender() ! MiningOrdered
5454
context.become(working(mineBlocks.numBlocks, mineBlocks.withTransactions, parentBlock, None))

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ class BlockPreparator(
403403
block.copy(body = block.body.copy(transactionList = txExecuted)),
404404
execResult,
405405
worldPersisted.stateRootHash,
406-
worldToPersist
406+
worldPersisted
407407
)
408408
}
409409
}

0 commit comments

Comments
 (0)