Skip to content

Commit fda64e9

Browse files
[ETCM-355] Post merge fix
1 parent eb751bc commit fda64e9

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/scala/io/iohk/ethereum/network/handshaker/EthNodeStatus64ExchangeState.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ case class EthNodeStatus64ExchangeState(
2222
override protected def createStatusMsg(): MessageSerializable = {
2323
val bestBlockHeader = getBestBlockHeader()
2424
val chainWeight = blockchain.getChainWeightByHash(bestBlockHeader.hash).get
25-
val genesisHash = blockchain.genesisHeader.hash
25+
val genesisHash = blockchainReader.genesisHeader.hash
2626

2727
val status = ETH64.Status(
2828
protocolVersion = ProtocolVersions.ETH64.version,
2929
networkId = peerConfiguration.networkId,
3030
totalDifficulty = chainWeight.totalDifficulty,
3131
bestHash = bestBlockHeader.hash,
3232
genesisHash = genesisHash,
33-
forkId = ForkId.create(genesisHash, blockchainConfig)(blockchain.getBestBlockNumber())
33+
forkId = ForkId.create(genesisHash, blockchainConfig)(blockchainReader.getBestBlockNumber())
3434
)
3535

3636
log.debug(s"Sending status $status")

src/test/scala/io/iohk/ethereum/network/handshaker/EtcHandshakerSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ class EtcHandshakerSpec extends AnyFlatSpec with Matchers {
196196

197197
val newChainWeight = ChainWeight.zero.increase(genesisBlock.header).increase(firstBlock.header)
198198

199-
blockchain.save(firstBlock, Nil, newChainWeight, saveAsBestBlock = true)
199+
blockchainWriter.save(firstBlock, Nil, newChainWeight, saveAsBestBlock = true)
200200

201201
val newLocalStatusMsg =
202202
localStatusMsg

0 commit comments

Comments
 (0)