From 79b225cb565ff280f52a6ccc26c18e87b430149f Mon Sep 17 00:00:00 2001 From: Simon Dudley Date: Sat, 21 Dec 2024 20:04:12 +1000 Subject: [PATCH] Fix wiring and unit test Signed-off-by: Simon Dudley --- .../internal/methods/EthGetTransactionReceiptTest.java | 4 +--- .../besu/ethereum/mainnet/MainnetProtocolSpecs.java | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java index 608577f47b7..702f06c7ad4 100644 --- a/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java +++ b/ethereum/api/src/test/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/EthGetTransactionReceiptTest.java @@ -15,7 +15,6 @@ package org.hyperledger.besu.ethereum.api.jsonrpc.internal.methods; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -323,8 +322,7 @@ private void mockBlockWithBlobTransaction(final Hash blockHash, final long block } private void mockProtocolSpec(final BlockHeader blockHeader) { - FeeMarket feeMarket = mock(CancunFeeMarket.class); - when(feeMarket.blobGasPricePerGas(any())).thenCallRealMethod(); + FeeMarket feeMarket = new CancunFeeMarket(0, Optional.empty()); ProtocolSpec spec = mock(ProtocolSpec.class); when(spec.getFeeMarket()).thenReturn(feeMarket); when(spec.getGasCalculator()).thenReturn(new CancunGasCalculator()); diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java index 60e766b6673..af71df1ab5a 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/MainnetProtocolSpecs.java @@ -824,7 +824,7 @@ static ProtocolSpecBuilder pragueDefinition( londonForkBlockNumber, miningConfiguration.getMinTransactionGasPrice()); } else { pragueFeeMarket = - FeeMarket.cancun(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas()); + FeeMarket.prague(londonForkBlockNumber, genesisConfigOptions.getBaseFeePerGas()); } return cancunDefinition(