Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removing ExecutionPayloadV4 #8667

Merged
merged 1 commit into from
Oct 2, 2024
Merged

Removing ExecutionPayloadV4 #8667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 0 additions & 88 deletions ...t/src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/ExecutionPayloadV4.java
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...src/main/java/tech/pegasys/teku/ethereum/executionclient/schema/GetPayloadV4Response.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import tech.pegasys.teku.ethereum.executionclient.serialization.UInt256AsHexSerializer;

public class GetPayloadV4Response {
public final ExecutionPayloadV4 executionPayload;
public final ExecutionPayloadV3 executionPayload;

@JsonSerialize(using = UInt256AsHexSerializer.class)
@JsonDeserialize(using = UInt256AsHexDeserializer.class)
Expand All @@ -34,7 +34,7 @@ public class GetPayloadV4Response {
public final boolean shouldOverrideBuilder;

public GetPayloadV4Response(
final @JsonProperty("executionPayload") ExecutionPayloadV4 executionPayload,
final @JsonProperty("executionPayload") ExecutionPayloadV3 executionPayload,
final @JsonProperty("blockValue") UInt256 blockValue,
final @JsonProperty("blobsBundle") BlobsBundleV1 blobsBundle,
final @JsonProperty("shouldOverrideBuilder") boolean shouldOverrideBuilder) {
Expand Down
4 changes: 2 additions & 2 deletions .../test/java/tech/pegasys/teku/ethereum/executionclient/methods/EngineGetPayloadV4Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import tech.pegasys.teku.ethereum.executionclient.ExecutionEngineClient;
import tech.pegasys.teku.ethereum.executionclient.response.InvalidRemoteResponseException;
import tech.pegasys.teku.ethereum.executionclient.schema.BlobsBundleV1;
import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV4;
import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV3;
import tech.pegasys.teku.ethereum.executionclient.schema.GetPayloadV4Response;
import tech.pegasys.teku.ethereum.executionclient.schema.Response;
import tech.pegasys.teku.infrastructure.async.SafeFuture;
Expand Down Expand Up @@ -142,7 +142,7 @@ private SafeFuture<Response<GetPayloadV4Response>> dummySuccessfulResponse(
return SafeFuture.completedFuture(
new Response<>(
new GetPayloadV4Response(
ExecutionPayloadV4.fromInternalExecutionPayload(executionPayload),
ExecutionPayloadV3.fromInternalExecutionPayload(executionPayload),
blockValue,
BlobsBundleV1.fromInternalBlobsBundle(blobsBundle),
false)));
Expand Down
3 changes: 1 addition & 2 deletions ...est/java/tech/pegasys/teku/ethereum/executionlayer/ElectraExecutionClientHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import org.junit.jupiter.api.Test;
import tech.pegasys.teku.ethereum.executionclient.schema.BlobsBundleV1;
import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV3;
import tech.pegasys.teku.ethereum.executionclient.schema.ExecutionPayloadV4;
import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceStateV1;
import tech.pegasys.teku.ethereum.executionclient.schema.ForkChoiceUpdatedResult;
import tech.pegasys.teku.ethereum.executionclient.schema.GetPayloadV4Response;
Expand Down Expand Up @@ -65,7 +64,7 @@ void engineGetPayload_shouldCallGetPayloadV4() throws ExecutionException, Interr
SafeFuture.completedFuture(
new Response<>(
new GetPayloadV4Response(
ExecutionPayloadV4.fromInternalExecutionPayload(
ExecutionPayloadV3.fromInternalExecutionPayload(
dataStructureUtil.randomExecutionPayload()),
UInt256.MAX_VALUE,
BlobsBundleV1.fromInternalBlobsBundle(dataStructureUtil.randomBlobsBundle()),
Expand Down