forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Qbft validation selection was incorrectly being applied for non valid…
…ator selection mode transitions Signed-off-by: Jason Frame <jasonwframe@gmail.com>
- Loading branch information
Showing
5 changed files
with
262 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
112 changes: 112 additions & 0 deletions
112
consensus/qbft/src/test/java/org/hyperledger/besu/consensus/qbft/QbftBlockHeaderUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| package org.hyperledger.besu.consensus.qbft; | ||
|
|
||
| import static java.util.Collections.singletonList; | ||
|
|
||
| import org.hyperledger.besu.consensus.common.bft.BftBlockHeaderFunctions; | ||
| import org.hyperledger.besu.consensus.common.bft.BftExtraData; | ||
| import org.hyperledger.besu.consensus.common.bft.BftExtraDataCodec; | ||
| import org.hyperledger.besu.consensus.common.bft.BftExtraDataFixture; | ||
| import org.hyperledger.besu.consensus.common.bft.Vote; | ||
| import org.hyperledger.besu.crypto.NodeKey; | ||
| import org.hyperledger.besu.datatypes.Address; | ||
| import org.hyperledger.besu.datatypes.Hash; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeader; | ||
| import org.hyperledger.besu.ethereum.core.BlockHeaderTestFixture; | ||
| import org.hyperledger.besu.ethereum.core.Difficulty; | ||
| import org.hyperledger.besu.ethereum.core.Util; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
|
|
||
| import org.apache.tuweni.bytes.Bytes; | ||
|
|
||
| public class QbftBlockHeaderUtils { | ||
|
|
||
| @FunctionalInterface | ||
| public interface HeaderModifier { | ||
|
|
||
| void update(BlockHeaderTestFixture blockHeaderTestFixture); | ||
| } | ||
|
|
||
| public static BlockHeaderTestFixture createPresetHeaderBuilder( | ||
| final long number, | ||
| final NodeKey proposerNodeKey, | ||
| final List<Address> validators, | ||
| final BlockHeader parent) { | ||
| return createPresetHeaderBuilder(number, proposerNodeKey, validators, parent, null); | ||
| } | ||
|
|
||
| public static BlockHeaderTestFixture createPresetHeaderBuilderForContractMode( | ||
| final long number, | ||
| final NodeKey proposerNodeKey, | ||
| final BlockHeader parent, | ||
| final HeaderModifier modifier) { | ||
| final BlockHeaderTestFixture builder = new BlockHeaderTestFixture(); | ||
| final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec(); | ||
| populateDefaultBlockHeader( | ||
| number, proposerNodeKey, parent, modifier, builder, qbftExtraDataEncoder); | ||
|
|
||
| final BftExtraData bftExtraData = | ||
| BftExtraDataFixture.createExtraData( | ||
| builder.buildHeader(), | ||
| Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]), | ||
| Optional.empty(), | ||
| Collections.emptyList(), | ||
| singletonList(proposerNodeKey), | ||
| 0x2A, | ||
| qbftExtraDataEncoder); | ||
|
|
||
| builder.extraData(qbftExtraDataEncoder.encode(bftExtraData)); | ||
| return builder; | ||
| } | ||
|
|
||
| public static BlockHeaderTestFixture createPresetHeaderBuilder( | ||
| final long number, | ||
| final NodeKey proposerNodeKey, | ||
| final List<Address> validators, | ||
| final BlockHeader parent, | ||
| final HeaderModifier modifier) { | ||
| final BlockHeaderTestFixture builder = new BlockHeaderTestFixture(); | ||
| final QbftExtraDataCodec qbftExtraDataEncoder = new QbftExtraDataCodec(); | ||
| populateDefaultBlockHeader( | ||
| number, proposerNodeKey, parent, modifier, builder, qbftExtraDataEncoder); | ||
|
|
||
| final BftExtraData bftExtraData = | ||
| BftExtraDataFixture.createExtraData( | ||
| builder.buildHeader(), | ||
| Bytes.wrap(new byte[BftExtraDataCodec.EXTRA_VANITY_LENGTH]), | ||
| Optional.of(Vote.authVote(Address.fromHexString("1"))), | ||
| validators, | ||
| singletonList(proposerNodeKey), | ||
| 0x2A, | ||
| qbftExtraDataEncoder); | ||
|
|
||
| builder.extraData(qbftExtraDataEncoder.encode(bftExtraData)); | ||
| return builder; | ||
| } | ||
|
|
||
| private static void populateDefaultBlockHeader( | ||
| final long number, | ||
| final NodeKey proposerNodeKey, | ||
| final BlockHeader parent, | ||
| final HeaderModifier modifier, | ||
| final BlockHeaderTestFixture builder, | ||
| final QbftExtraDataCodec qbftExtraDataEncoder) { | ||
| if (parent != null) { | ||
| builder.parentHash(parent.getHash()); | ||
| } | ||
| builder.number(number); | ||
| builder.gasLimit(5000); | ||
| builder.timestamp(6000 * number); | ||
| builder.mixHash( | ||
| Hash.fromHexString("0x63746963616c2062797a616e74696e65206661756c7420746f6c6572616e6365")); | ||
| builder.difficulty(Difficulty.ONE); | ||
| builder.coinbase(Util.publicKeyToAddress(proposerNodeKey.getPublicKey())); | ||
| builder.blockHeaderFunctions(BftBlockHeaderFunctions.forCommittedSeal(qbftExtraDataEncoder)); | ||
|
|
||
| if (modifier != null) { | ||
| modifier.update(builder); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.