From c5e8836340cb5e3a0a40c1a9617d1e3c533eac23 Mon Sep 17 00:00:00 2001 From: Enrico Del Fante Date: Thu, 21 Nov 2024 14:10:58 +0100 Subject: [PATCH] rebase --- .../pegasys/teku/spec/schemas/SchemaDefinitionsElectra.java | 2 +- .../teku/spec/schemas/registry/SchemaRegistryBuilder.java | 6 +++--- .../pegasys/teku/spec/schemas/registry/SchemaTypes.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsElectra.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsElectra.java index 38887b0c241..1ab55b40ae9 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsElectra.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsElectra.java @@ -42,9 +42,9 @@ import tech.pegasys.teku.spec.datastructures.execution.versions.electra.ExecutionRequestsSchema; import tech.pegasys.teku.spec.datastructures.execution.versions.electra.WithdrawalRequest; import tech.pegasys.teku.spec.datastructures.execution.versions.electra.WithdrawalRequestSchema; +import tech.pegasys.teku.spec.datastructures.operations.AttestationSchema; import tech.pegasys.teku.spec.datastructures.operations.SingleAttestation; import tech.pegasys.teku.spec.datastructures.operations.SingleAttestationSchema; -import tech.pegasys.teku.spec.datastructures.operations.SingleAttestation; import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingConsolidation; import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingDeposit; import tech.pegasys.teku.spec.datastructures.state.versions.electra.PendingPartialWithdrawal; diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaRegistryBuilder.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaRegistryBuilder.java index e5e921a7567..f4c7f4aa92f 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaRegistryBuilder.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaRegistryBuilder.java @@ -173,12 +173,12 @@ public static SchemaRegistryBuilder create() { .addProvider(createPendingPartialWithdrawalsSchemaProvider()) .addProvider(createPendingDepositsSchemaProvider()) .addProvider(createExecutionRequestsSchemaProvider()) -.addProvider(createSingleAttestationSchemaProvider()); + .addProvider(createSingleAttestationSchemaProvider()); } private static SchemaProvider createSingleAttestationSchemaProvider() { - return constantProviderBuilder(SINGLE_ATTESTATION_SCHEMA) - .withCreator(ELECTRA, (registry, specConfig) -> new SingleAttestationSchema()) + return providerBuilder(SINGLE_ATTESTATION_SCHEMA) + .withCreator(ELECTRA, (registry, specConfig, schemaName) -> new SingleAttestationSchema()) .build(); } diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaTypes.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaTypes.java index 053a78b602e..11afdf0fc1a 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaTypes.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/registry/SchemaTypes.java @@ -159,7 +159,7 @@ public class SchemaTypes { public static final SchemaId> PENDING_DEPOSITS_SCHEMA = create("PENDING_DEPOSITS_SCHEMA"); public static final SchemaId SINGLE_ATTESTATION_SCHEMA = - create("SINGLE_ATTESTATION_SCHEMA"); + create("SINGLE_ATTESTATION_SCHEMA"); private SchemaTypes() { // Prevent instantiation