Skip to content

Commit b02b005

Browse files
committed
Remove unused methods on ExecutionPayloadBuilder
1 parent 67c1366 commit b02b005

4 files changed

Lines changed: 2 additions & 40 deletions

File tree

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/ExecutionPayloadBuilder.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,6 @@
2121
import tech.pegasys.teku.infrastructure.bytes.Bytes20;
2222
import tech.pegasys.teku.infrastructure.unsigned.UInt64;
2323
import tech.pegasys.teku.spec.datastructures.execution.versions.capella.Withdrawal;
24-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ConsolidationRequest;
25-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.DepositRequest;
26-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.WithdrawalRequest;
2724

2825
public interface ExecutionPayloadBuilder {
2926
ExecutionPayloadBuilder parentHash(Bytes32 parentHash);
@@ -60,13 +57,5 @@ public interface ExecutionPayloadBuilder {
6057

6158
ExecutionPayloadBuilder excessBlobGas(Supplier<UInt64> excessBlobGasSupplier);
6259

63-
ExecutionPayloadBuilder depositRequests(Supplier<List<DepositRequest>> depositRequestsSupplier);
64-
65-
ExecutionPayloadBuilder withdrawalRequests(
66-
Supplier<List<WithdrawalRequest>> withdrawalRequestsSupplier);
67-
68-
ExecutionPayloadBuilder consolidationRequests(
69-
Supplier<List<ConsolidationRequest>> consolidationRequestsSupplier);
70-
7160
ExecutionPayload build();
7261
}

ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/execution/versions/bellatrix/ExecutionPayloadBuilderBellatrix.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayload;
3030
import tech.pegasys.teku.spec.datastructures.execution.ExecutionPayloadBuilder;
3131
import tech.pegasys.teku.spec.datastructures.execution.versions.capella.Withdrawal;
32-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ConsolidationRequest;
33-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.DepositRequest;
34-
import tech.pegasys.teku.spec.datastructures.execution.versions.electra.WithdrawalRequest;
3532

3633
public class ExecutionPayloadBuilderBellatrix implements ExecutionPayloadBuilder {
3734
private ExecutionPayloadSchemaBellatrix schema;
@@ -155,24 +152,6 @@ public ExecutionPayloadBuilder excessBlobGas(final Supplier<UInt64> excessBlobGa
155152
return this;
156153
}
157154

158-
@Override
159-
public ExecutionPayloadBuilder depositRequests(
160-
final Supplier<List<DepositRequest>> depositRequestsSupplier) {
161-
return this;
162-
}
163-
164-
@Override
165-
public ExecutionPayloadBuilder withdrawalRequests(
166-
final Supplier<List<WithdrawalRequest>> withdrawalRequestsSupplier) {
167-
return this;
168-
}
169-
170-
@Override
171-
public ExecutionPayloadBuilder consolidationRequests(
172-
final Supplier<List<ConsolidationRequest>> consolidationRequestsSupplier) {
173-
return this;
174-
}
175-
176155
protected void validateSchema() {
177156
checkNotNull(schema, "schema must be specified");
178157
}

ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/generator/BlockProposalTestUtil.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,7 @@ private ExecutionPayload createExecutionPayload(
272272
.transactions(transactions.orElse(Collections.emptyList()))
273273
.withdrawals(List::of)
274274
.blobGasUsed(() -> UInt64.ZERO)
275-
.excessBlobGas(() -> UInt64.ZERO)
276-
.depositRequests(List::of)
277-
.withdrawalRequests(List::of)
278-
.consolidationRequests(List::of));
275+
.excessBlobGas(() -> UInt64.ZERO));
279276
}
280277

281278
private Boolean isMergeTransitionComplete(final BeaconState state) {

ethereum/spec/src/testFixtures/java/tech/pegasys/teku/spec/util/DataStructureUtil.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -697,10 +697,7 @@ public ExecutionPayload randomExecutionPayload(
697697
.transactions(randomExecutionPayloadTransactions())
698698
.withdrawals(this::randomExecutionPayloadWithdrawals)
699699
.blobGasUsed(this::randomUInt64)
700-
.excessBlobGas(this::randomUInt64)
701-
.depositRequests(this::randomDepositRequests)
702-
.withdrawalRequests(this::randomWithdrawalRequests)
703-
.consolidationRequests(this::randomConsolidationRequests);
700+
.excessBlobGas(this::randomUInt64);
704701
builderModifier.accept(executionPayloadBuilder);
705702
});
706703
}

0 commit comments

Comments
 (0)