mirror of https://github.com/hyperledger/besu
Make block txs selection max time aware of PoA transitions (#6676)
Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>pull/6698/head
Fabio Di Fabio
8 months ago
committed by
GitHub
parent
246cce41e1
commit
65f8880fb7
@ -0,0 +1,204 @@ |
||||
/* |
||||
* Copyright Hyperledger Besu contributors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.controller; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import static org.mockito.ArgumentMatchers.any; |
||||
import static org.mockito.Mockito.lenient; |
||||
import static org.mockito.Mockito.mock; |
||||
|
||||
import org.hyperledger.besu.config.CheckpointConfigOptions; |
||||
import org.hyperledger.besu.config.GenesisConfigFile; |
||||
import org.hyperledger.besu.config.GenesisConfigOptions; |
||||
import org.hyperledger.besu.cryptoservices.NodeKey; |
||||
import org.hyperledger.besu.cryptoservices.NodeKeyUtils; |
||||
import org.hyperledger.besu.datatypes.Address; |
||||
import org.hyperledger.besu.datatypes.Hash; |
||||
import org.hyperledger.besu.datatypes.Wei; |
||||
import org.hyperledger.besu.ethereum.GasLimitCalculator; |
||||
import org.hyperledger.besu.ethereum.core.Block; |
||||
import org.hyperledger.besu.ethereum.core.BlockBody; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeader; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; |
||||
import org.hyperledger.besu.ethereum.core.Difficulty; |
||||
import org.hyperledger.besu.ethereum.core.MiningParameters; |
||||
import org.hyperledger.besu.ethereum.core.PrivacyParameters; |
||||
import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; |
||||
import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; |
||||
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; |
||||
import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; |
||||
import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; |
||||
import org.hyperledger.besu.ethereum.storage.StorageProvider; |
||||
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; |
||||
import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage; |
||||
import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage; |
||||
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration; |
||||
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; |
||||
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator; |
||||
import org.hyperledger.besu.evm.internal.EvmConfiguration; |
||||
import org.hyperledger.besu.evm.log.LogsBloomFilter; |
||||
import org.hyperledger.besu.metrics.ObservableMetricsSystem; |
||||
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; |
||||
import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.nio.file.Path; |
||||
import java.time.Clock; |
||||
import java.util.List; |
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException; |
||||
import com.fasterxml.jackson.databind.ObjectMapper; |
||||
import com.google.common.collect.Range; |
||||
import org.apache.tuweni.bytes.Bytes; |
||||
import org.junit.jupiter.api.BeforeEach; |
||||
import org.junit.jupiter.api.Test; |
||||
import org.junit.jupiter.api.extension.ExtendWith; |
||||
import org.junit.jupiter.api.io.TempDir; |
||||
import org.mockito.Mock; |
||||
import org.mockito.junit.jupiter.MockitoExtension; |
||||
|
||||
@ExtendWith(MockitoExtension.class) |
||||
public abstract class AbstractBftBesuControllerBuilderTest { |
||||
|
||||
protected BesuControllerBuilder bftBesuControllerBuilder; |
||||
@Mock protected GenesisConfigFile genesisConfigFile; |
||||
@Mock protected GenesisConfigOptions genesisConfigOptions; |
||||
@Mock private SynchronizerConfiguration synchronizerConfiguration; |
||||
@Mock private EthProtocolConfiguration ethProtocolConfiguration; |
||||
@Mock CheckpointConfigOptions checkpointConfigOptions; |
||||
@Mock private PrivacyParameters privacyParameters; |
||||
@Mock private Clock clock; |
||||
@Mock private StorageProvider storageProvider; |
||||
@Mock private GasLimitCalculator gasLimitCalculator; |
||||
@Mock private WorldStatePreimageStorage worldStatePreimageStorage; |
||||
private static final BigInteger networkId = BigInteger.ONE; |
||||
private static final NodeKey nodeKey = NodeKeyUtils.generate(); |
||||
private final TransactionPoolConfiguration poolConfiguration = |
||||
TransactionPoolConfiguration.DEFAULT; |
||||
private final ObservableMetricsSystem observableMetricsSystem = new NoOpMetricsSystem(); |
||||
protected final ObjectMapper objectMapper = new ObjectMapper(); |
||||
private final MiningParameters miningParameters = MiningParameters.newDefault(); |
||||
@TempDir Path tempDir; |
||||
|
||||
@BeforeEach |
||||
public void setup() throws JsonProcessingException { |
||||
// besu controller setup
|
||||
final ForestWorldStateKeyValueStorage worldStateKeyValueStorage = |
||||
mock(ForestWorldStateKeyValueStorage.class); |
||||
final WorldStateStorageCoordinator worldStateStorageCoordinator = |
||||
new WorldStateStorageCoordinator(worldStateKeyValueStorage); |
||||
|
||||
lenient().when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString()); |
||||
lenient().when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString()); |
||||
lenient().when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString()); |
||||
lenient().when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1)); |
||||
lenient().when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions); |
||||
lenient().when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions); |
||||
lenient().when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions); |
||||
lenient() |
||||
.when(storageProvider.createBlockchainStorage(any(), any())) |
||||
.thenReturn( |
||||
new KeyValueStoragePrefixedKeyBlockchainStorage( |
||||
new InMemoryKeyValueStorage(), |
||||
new VariablesKeyValueStorage(new InMemoryKeyValueStorage()), |
||||
new MainnetBlockHeaderFunctions())); |
||||
lenient() |
||||
.when( |
||||
storageProvider.createWorldStateStorageCoordinator( |
||||
DataStorageConfiguration.DEFAULT_FOREST_CONFIG)) |
||||
.thenReturn(worldStateStorageCoordinator); |
||||
lenient().when(worldStateKeyValueStorage.isWorldStateAvailable(any())).thenReturn(true); |
||||
lenient() |
||||
.when(worldStateKeyValueStorage.updater()) |
||||
.thenReturn(mock(ForestWorldStateKeyValueStorage.Updater.class)); |
||||
lenient() |
||||
.when(worldStatePreimageStorage.updater()) |
||||
.thenReturn(mock(WorldStatePreimageStorage.Updater.class)); |
||||
lenient() |
||||
.when(storageProvider.createWorldStatePreimageStorage()) |
||||
.thenReturn(worldStatePreimageStorage); |
||||
lenient().when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1); |
||||
lenient().when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1); |
||||
lenient().when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1); |
||||
|
||||
lenient() |
||||
.when(synchronizerConfiguration.getBlockPropagationRange()) |
||||
.thenReturn(Range.closed(1L, 2L)); |
||||
|
||||
setupBftGenesisConfigOptions(); |
||||
|
||||
bftBesuControllerBuilder = |
||||
createBftControllerBuilder() |
||||
.genesisConfigFile(genesisConfigFile) |
||||
.synchronizerConfiguration(synchronizerConfiguration) |
||||
.ethProtocolConfiguration(ethProtocolConfiguration) |
||||
.networkId(networkId) |
||||
.miningParameters(miningParameters) |
||||
.metricsSystem(observableMetricsSystem) |
||||
.privacyParameters(privacyParameters) |
||||
.dataDirectory(tempDir) |
||||
.clock(clock) |
||||
.transactionPoolConfiguration(poolConfiguration) |
||||
.dataStorageConfiguration(DataStorageConfiguration.DEFAULT_FOREST_CONFIG) |
||||
.nodeKey(nodeKey) |
||||
.storageProvider(storageProvider) |
||||
.gasLimitCalculator(gasLimitCalculator) |
||||
.evmConfiguration(EvmConfiguration.DEFAULT) |
||||
.networkConfiguration(NetworkingConfiguration.create()); |
||||
} |
||||
|
||||
protected abstract void setupBftGenesisConfigOptions() throws JsonProcessingException; |
||||
|
||||
protected abstract BesuControllerBuilder createBftControllerBuilder(); |
||||
|
||||
@Test |
||||
public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() { |
||||
final var besuController = bftBesuControllerBuilder.build(); |
||||
final var protocolContext = besuController.getProtocolContext(); |
||||
|
||||
final BlockHeader header1 = |
||||
new BlockHeader( |
||||
protocolContext.getBlockchain().getChainHeadHash(), |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Address.ZERO, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
LogsBloomFilter.builder().build(), |
||||
Difficulty.ONE, |
||||
1, |
||||
0, |
||||
0, |
||||
0, |
||||
protocolContext.getBlockchain().getChainHead().getBlockHeader().getExtraData(), |
||||
Wei.ZERO, |
||||
Hash.EMPTY, |
||||
0, |
||||
null, |
||||
null, |
||||
null, |
||||
null, |
||||
null, |
||||
getBlockHeaderFunctions()); |
||||
final Block block1 = new Block(header1, BlockBody.empty()); |
||||
|
||||
protocolContext.getBlockchain().appendBlock(block1, List.of()); |
||||
|
||||
assertThat(miningParameters.getBlockPeriodSeconds()).isNotEmpty().hasValue(2); |
||||
assertThat(miningParameters.getBlockTxsSelectionMaxTime()).isEqualTo(2000 * 75 / 100); |
||||
} |
||||
|
||||
protected abstract BlockHeaderFunctions getBlockHeaderFunctions(); |
||||
} |
||||
@ -0,0 +1,231 @@ |
||||
/* |
||||
* Copyright Hyperledger Besu contributors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.controller; |
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat; |
||||
import static org.mockito.ArgumentMatchers.any; |
||||
import static org.mockito.Mockito.lenient; |
||||
import static org.mockito.Mockito.mock; |
||||
import static org.mockito.Mockito.when; |
||||
|
||||
import org.hyperledger.besu.config.CheckpointConfigOptions; |
||||
import org.hyperledger.besu.config.GenesisConfigFile; |
||||
import org.hyperledger.besu.config.GenesisConfigOptions; |
||||
import org.hyperledger.besu.config.ImmutableCliqueConfigOptions; |
||||
import org.hyperledger.besu.config.TransitionsConfigOptions; |
||||
import org.hyperledger.besu.consensus.clique.CliqueBlockHeaderFunctions; |
||||
import org.hyperledger.besu.cryptoservices.NodeKey; |
||||
import org.hyperledger.besu.cryptoservices.NodeKeyUtils; |
||||
import org.hyperledger.besu.datatypes.Address; |
||||
import org.hyperledger.besu.datatypes.Hash; |
||||
import org.hyperledger.besu.datatypes.Wei; |
||||
import org.hyperledger.besu.ethereum.GasLimitCalculator; |
||||
import org.hyperledger.besu.ethereum.core.Block; |
||||
import org.hyperledger.besu.ethereum.core.BlockBody; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeader; |
||||
import org.hyperledger.besu.ethereum.core.Difficulty; |
||||
import org.hyperledger.besu.ethereum.core.MiningParameters; |
||||
import org.hyperledger.besu.ethereum.core.PrivacyParameters; |
||||
import org.hyperledger.besu.ethereum.eth.EthProtocolConfiguration; |
||||
import org.hyperledger.besu.ethereum.eth.sync.SynchronizerConfiguration; |
||||
import org.hyperledger.besu.ethereum.eth.transactions.TransactionPoolConfiguration; |
||||
import org.hyperledger.besu.ethereum.mainnet.MainnetBlockHeaderFunctions; |
||||
import org.hyperledger.besu.ethereum.p2p.config.NetworkingConfiguration; |
||||
import org.hyperledger.besu.ethereum.storage.StorageProvider; |
||||
import org.hyperledger.besu.ethereum.storage.keyvalue.KeyValueStoragePrefixedKeyBlockchainStorage; |
||||
import org.hyperledger.besu.ethereum.storage.keyvalue.VariablesKeyValueStorage; |
||||
import org.hyperledger.besu.ethereum.trie.forest.storage.ForestWorldStateKeyValueStorage; |
||||
import org.hyperledger.besu.ethereum.worldstate.DataStorageConfiguration; |
||||
import org.hyperledger.besu.ethereum.worldstate.WorldStatePreimageStorage; |
||||
import org.hyperledger.besu.ethereum.worldstate.WorldStateStorageCoordinator; |
||||
import org.hyperledger.besu.evm.internal.EvmConfiguration; |
||||
import org.hyperledger.besu.evm.log.LogsBloomFilter; |
||||
import org.hyperledger.besu.metrics.ObservableMetricsSystem; |
||||
import org.hyperledger.besu.metrics.noop.NoOpMetricsSystem; |
||||
import org.hyperledger.besu.services.kvstore.InMemoryKeyValueStorage; |
||||
|
||||
import java.math.BigInteger; |
||||
import java.nio.file.Path; |
||||
import java.time.Clock; |
||||
import java.util.List; |
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException; |
||||
import com.fasterxml.jackson.databind.ObjectMapper; |
||||
import com.fasterxml.jackson.databind.node.ObjectNode; |
||||
import com.google.common.collect.Range; |
||||
import org.apache.tuweni.bytes.Bytes; |
||||
import org.junit.jupiter.api.BeforeEach; |
||||
import org.junit.jupiter.api.Test; |
||||
import org.junit.jupiter.api.extension.ExtendWith; |
||||
import org.junit.jupiter.api.io.TempDir; |
||||
import org.mockito.Mock; |
||||
import org.mockito.junit.jupiter.MockitoExtension; |
||||
|
||||
@ExtendWith(MockitoExtension.class) |
||||
public class CliqueBesuControllerBuilderTest { |
||||
|
||||
private BesuControllerBuilder cliqueBesuControllerBuilder; |
||||
|
||||
@Mock private GenesisConfigFile genesisConfigFile; |
||||
@Mock private GenesisConfigOptions genesisConfigOptions; |
||||
@Mock private SynchronizerConfiguration synchronizerConfiguration; |
||||
@Mock private EthProtocolConfiguration ethProtocolConfiguration; |
||||
@Mock private CheckpointConfigOptions checkpointConfigOptions; |
||||
@Mock private PrivacyParameters privacyParameters; |
||||
@Mock private Clock clock; |
||||
@Mock private StorageProvider storageProvider; |
||||
@Mock private GasLimitCalculator gasLimitCalculator; |
||||
@Mock private WorldStatePreimageStorage worldStatePreimageStorage; |
||||
private static final BigInteger networkId = BigInteger.ONE; |
||||
private static final NodeKey nodeKey = NodeKeyUtils.generate(); |
||||
private final TransactionPoolConfiguration poolConfiguration = |
||||
TransactionPoolConfiguration.DEFAULT; |
||||
private final ObservableMetricsSystem observableMetricsSystem = new NoOpMetricsSystem(); |
||||
private final ObjectMapper objectMapper = new ObjectMapper(); |
||||
private final MiningParameters miningParameters = MiningParameters.newDefault(); |
||||
|
||||
@TempDir Path tempDir; |
||||
|
||||
@BeforeEach |
||||
public void setup() throws JsonProcessingException { |
||||
// Clique Besu controller setup
|
||||
final ForestWorldStateKeyValueStorage worldStateKeyValueStorage = |
||||
mock(ForestWorldStateKeyValueStorage.class); |
||||
final WorldStateStorageCoordinator worldStateStorageCoordinator = |
||||
new WorldStateStorageCoordinator(worldStateKeyValueStorage); |
||||
|
||||
lenient().when(genesisConfigFile.getParentHash()).thenReturn(Hash.ZERO.toHexString()); |
||||
lenient().when(genesisConfigFile.getDifficulty()).thenReturn(Bytes.of(0).toHexString()); |
||||
when(genesisConfigFile.getExtraData()) |
||||
.thenReturn( |
||||
"0x0000000000000000000000000000000000000000000000000000000000000000b9b81ee349c3807e46bc71aa2632203c5b4620340000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"); |
||||
lenient().when(genesisConfigFile.getMixHash()).thenReturn(Hash.ZERO.toHexString()); |
||||
lenient().when(genesisConfigFile.getNonce()).thenReturn(Long.toHexString(1)); |
||||
lenient().when(genesisConfigFile.getConfigOptions(any())).thenReturn(genesisConfigOptions); |
||||
lenient().when(genesisConfigFile.getConfigOptions()).thenReturn(genesisConfigOptions); |
||||
lenient().when(genesisConfigOptions.getCheckpointOptions()).thenReturn(checkpointConfigOptions); |
||||
lenient() |
||||
.when(storageProvider.createBlockchainStorage(any(), any())) |
||||
.thenReturn( |
||||
new KeyValueStoragePrefixedKeyBlockchainStorage( |
||||
new InMemoryKeyValueStorage(), |
||||
new VariablesKeyValueStorage(new InMemoryKeyValueStorage()), |
||||
new MainnetBlockHeaderFunctions())); |
||||
lenient() |
||||
.when( |
||||
storageProvider.createWorldStateStorageCoordinator( |
||||
DataStorageConfiguration.DEFAULT_FOREST_CONFIG)) |
||||
.thenReturn(worldStateStorageCoordinator); |
||||
lenient().when(worldStateKeyValueStorage.isWorldStateAvailable(any())).thenReturn(true); |
||||
lenient() |
||||
.when(worldStateKeyValueStorage.updater()) |
||||
.thenReturn(mock(ForestWorldStateKeyValueStorage.Updater.class)); |
||||
lenient() |
||||
.when(worldStatePreimageStorage.updater()) |
||||
.thenReturn(mock(WorldStatePreimageStorage.Updater.class)); |
||||
lenient() |
||||
.when(storageProvider.createWorldStatePreimageStorage()) |
||||
.thenReturn(worldStatePreimageStorage); |
||||
lenient().when(synchronizerConfiguration.getDownloaderParallelism()).thenReturn(1); |
||||
lenient().when(synchronizerConfiguration.getTransactionsParallelism()).thenReturn(1); |
||||
lenient().when(synchronizerConfiguration.getComputationParallelism()).thenReturn(1); |
||||
|
||||
lenient() |
||||
.when(synchronizerConfiguration.getBlockPropagationRange()) |
||||
.thenReturn(Range.closed(1L, 2L)); |
||||
|
||||
// clique prepForBuild setup
|
||||
lenient() |
||||
.when(genesisConfigOptions.getCliqueConfigOptions()) |
||||
.thenReturn( |
||||
ImmutableCliqueConfigOptions.builder() |
||||
.epochLength(30) |
||||
.createEmptyBlocks(true) |
||||
.blockPeriodSeconds(1) |
||||
.build()); |
||||
|
||||
final var jsonTransitions = |
||||
(ObjectNode) |
||||
objectMapper.readTree( |
||||
""" |
||||
{"clique": [ |
||||
{ |
||||
"block": 2, |
||||
"blockperiodseconds": 2 |
||||
} |
||||
]} |
||||
"""); |
||||
|
||||
lenient() |
||||
.when(genesisConfigOptions.getTransitions()) |
||||
.thenReturn(new TransitionsConfigOptions(jsonTransitions)); |
||||
|
||||
cliqueBesuControllerBuilder = |
||||
new CliqueBesuControllerBuilder() |
||||
.genesisConfigFile(genesisConfigFile) |
||||
.synchronizerConfiguration(synchronizerConfiguration) |
||||
.ethProtocolConfiguration(ethProtocolConfiguration) |
||||
.networkId(networkId) |
||||
.miningParameters(miningParameters) |
||||
.metricsSystem(observableMetricsSystem) |
||||
.privacyParameters(privacyParameters) |
||||
.dataDirectory(tempDir) |
||||
.clock(clock) |
||||
.transactionPoolConfiguration(poolConfiguration) |
||||
.dataStorageConfiguration(DataStorageConfiguration.DEFAULT_FOREST_CONFIG) |
||||
.nodeKey(nodeKey) |
||||
.storageProvider(storageProvider) |
||||
.gasLimitCalculator(gasLimitCalculator) |
||||
.evmConfiguration(EvmConfiguration.DEFAULT) |
||||
.networkConfiguration(NetworkingConfiguration.create()); |
||||
} |
||||
|
||||
@Test |
||||
public void miningParametersBlockPeriodSecondsIsUpdatedOnTransition() { |
||||
final var besuController = cliqueBesuControllerBuilder.build(); |
||||
final var protocolContext = besuController.getProtocolContext(); |
||||
|
||||
final BlockHeader header1 = |
||||
new BlockHeader( |
||||
protocolContext.getBlockchain().getChainHeadHash(), |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Address.ZERO, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
Hash.EMPTY_TRIE_HASH, |
||||
LogsBloomFilter.builder().build(), |
||||
Difficulty.ONE, |
||||
1, |
||||
0, |
||||
0, |
||||
0, |
||||
Bytes.EMPTY, |
||||
Wei.ZERO, |
||||
Hash.EMPTY, |
||||
0, |
||||
null, |
||||
null, |
||||
null, |
||||
null, |
||||
null, |
||||
new CliqueBlockHeaderFunctions()); |
||||
final Block block1 = new Block(header1, BlockBody.empty()); |
||||
|
||||
protocolContext.getBlockchain().appendBlock(block1, List.of()); |
||||
|
||||
assertThat(miningParameters.getBlockPeriodSeconds()).isNotEmpty().hasValue(2); |
||||
assertThat(miningParameters.getBlockTxsSelectionMaxTime()).isEqualTo(2000 * 75 / 100); |
||||
} |
||||
} |
||||
@ -0,0 +1,73 @@ |
||||
/* |
||||
* Copyright Hyperledger Besu contributors. |
||||
* |
||||
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with |
||||
* the License. You may obtain a copy of the License at |
||||
* |
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* |
||||
* Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on |
||||
* an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the |
||||
* specific language governing permissions and limitations under the License. |
||||
* |
||||
* SPDX-License-Identifier: Apache-2.0 |
||||
*/ |
||||
package org.hyperledger.besu.controller; |
||||
|
||||
import static org.mockito.Mockito.lenient; |
||||
import static org.mockito.Mockito.when; |
||||
|
||||
import org.hyperledger.besu.config.JsonBftConfigOptions; |
||||
import org.hyperledger.besu.config.TransitionsConfigOptions; |
||||
import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions; |
||||
import org.hyperledger.besu.consensus.common.bft.MutableBftConfigOptions; |
||||
import org.hyperledger.besu.consensus.ibft.IbftExtraDataCodec; |
||||
import org.hyperledger.besu.ethereum.core.BlockHeaderFunctions; |
||||
|
||||
import com.fasterxml.jackson.core.JsonProcessingException; |
||||
import com.fasterxml.jackson.databind.node.ObjectNode; |
||||
import org.junit.jupiter.api.extension.ExtendWith; |
||||
import org.mockito.junit.jupiter.MockitoExtension; |
||||
|
||||
@ExtendWith(MockitoExtension.class) |
||||
public class IbftBesuControllerBuilderTest extends AbstractBftBesuControllerBuilderTest { |
||||
|
||||
@Override |
||||
public void setupBftGenesisConfigOptions() throws JsonProcessingException { |
||||
|
||||
// Ibft prepForBuild setup
|
||||
lenient() |
||||
.when(genesisConfigOptions.getBftConfigOptions()) |
||||
.thenReturn(new MutableBftConfigOptions(JsonBftConfigOptions.DEFAULT)); |
||||
|
||||
final var jsonTransitions = |
||||
(ObjectNode) |
||||
objectMapper.readTree( |
||||
""" |
||||
{"ibft2": [ |
||||
{ |
||||
"block": 2, |
||||
"blockperiodseconds": 2 |
||||
} |
||||
]} |
||||
"""); |
||||
|
||||
lenient() |
||||
.when(genesisConfigOptions.getTransitions()) |
||||
.thenReturn(new TransitionsConfigOptions(jsonTransitions)); |
||||
|
||||
when(genesisConfigFile.getExtraData()) |
||||
.thenReturn( |
||||
"0xf83ea00000000000000000000000000000000000000000000000000000000000000000d594c2ab482b506de561668e07f04547232a72897daf808400000000c0"); |
||||
} |
||||
|
||||
@Override |
||||
protected BesuControllerBuilder createBftControllerBuilder() { |
||||
return new IbftBesuControllerBuilder(); |
||||
} |
||||
|
||||
@Override |
||||
protected BlockHeaderFunctions getBlockHeaderFunctions() { |
||||
return BftBlockHeaderFunctions.forOnchainBlock(new IbftExtraDataCodec()); |
||||
} |
||||
} |
||||
Loading…
Reference in new issue