fix shutter test execute engine tests #8313
Open
+146
−133
Conversation
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
LukaszRozmej
approved these changes
Mar 6, 2025
Comment on lines
+157
to
+224
| protected async Task<IReadOnlyList<ExecutionPayload>> ProduceBranchV1(IEngineRpcModule rpc, | ||
| MergeTestBlockchain chain, | ||
| int count, ExecutionPayload startingParentBlock, bool setHead, Hash256? random = null, | ||
| ulong slotLength = 12) | ||
| { | ||
| List<ExecutionPayload> blocks = new(); | ||
| ExecutionPayload parentBlock = startingParentBlock; | ||
| parentBlock.TryGetBlock(out Block? block); | ||
| UInt256? startingTotalDifficulty = block!.IsGenesis | ||
| ? block.Difficulty : chain.BlockFinder.FindHeader(block!.Header!.ParentHash!)!.TotalDifficulty; | ||
| BlockHeader parentHeader = block!.Header; | ||
| parentHeader.TotalDifficulty = startingTotalDifficulty + | ||
| parentHeader.Difficulty; | ||
| for (int i = 0; i < count; i++) | ||
| { | ||
| ExecutionPayload? getPayloadResult = await BuildAndGetPayloadOnBranch(rpc, chain, parentHeader, | ||
| parentBlock.Timestamp + slotLength, | ||
| random ?? TestItem.KeccakA, Address.Zero); | ||
| PayloadStatusV1 payloadStatusResponse = (await rpc.engine_newPayloadV1(getPayloadResult)).Data; | ||
| payloadStatusResponse.Status.Should().Be(PayloadStatus.Valid); | ||
| if (setHead) | ||
| { | ||
| Hash256 newHead = getPayloadResult!.BlockHash; | ||
| ForkchoiceStateV1 forkchoiceStateV1 = new(newHead, newHead, newHead); | ||
| ResultWrapper<ForkchoiceUpdatedV1Result> setHeadResponse = await rpc.engine_forkchoiceUpdatedV1(forkchoiceStateV1); | ||
| setHeadResponse.Data.PayloadStatus.Status.Should().Be(PayloadStatus.Valid); | ||
| setHeadResponse.Data.PayloadId.Should().Be(null); | ||
| } | ||
|
|
||
| blocks.Add((getPayloadResult)); | ||
| parentBlock = getPayloadResult; | ||
| parentBlock.TryGetBlock(out block!); | ||
| block.Header.TotalDifficulty = parentHeader.TotalDifficulty + block.Header.Difficulty; | ||
| parentHeader = block.Header; | ||
| } | ||
|
|
||
| return blocks; | ||
| } | ||
|
|
||
| protected async Task<ExecutionPayload> BuildAndGetPayloadOnBranch( | ||
| IEngineRpcModule rpc, MergeTestBlockchain chain, BlockHeader parentHeader, | ||
| ulong timestamp, Hash256 random, Address feeRecipient) | ||
| { | ||
| PayloadAttributes payloadAttributes = | ||
| new() { Timestamp = timestamp, PrevRandao = random, SuggestedFeeRecipient = feeRecipient }; | ||
|
|
||
| // we're using payloadService directly, because we can't use fcU for branch | ||
| string payloadId = chain.PayloadPreparationService!.StartPreparingPayload(parentHeader, payloadAttributes)!; | ||
|
|
||
| ResultWrapper<ExecutionPayload?> getPayloadResult = | ||
| await rpc.engine_getPayloadV1(Bytes.FromHexString(payloadId)); | ||
| return getPayloadResult.Data!; | ||
| } | ||
|
|
||
| protected ExecutionPayload CreateParentBlockRequestOnHead(IBlockTree blockTree) | ||
| { | ||
| Block? head = blockTree.Head ?? throw new NotSupportedException(); | ||
| return new ExecutionPayload() | ||
| { | ||
| BlockNumber = head.Number, | ||
| BlockHash = head.Hash!, | ||
| StateRoot = head.StateRoot!, | ||
| ReceiptsRoot = head.ReceiptsRoot!, | ||
| GasLimit = head.GasLimit, | ||
| Timestamp = head.Timestamp, | ||
| BaseFeePerGas = head.BaseFeePerGas, | ||
| }; | ||
| } |
There was a problem hiding this comment.
Wouldn't those be better as extension methods?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
EngineModuleTestswithout actually changing any behaviour. It just need the rpc factory method and some util function. This causes it to execute some engine module tests also.BaseEngineModuleTestsso that shutter tests does not execute the engine tests again.Types of changes
What types of changes does your code introduce?
Testing
Requires testing
If yes, did you write tests?