From ac6e6067a84d197d263b12650097d457e906b93d Mon Sep 17 00:00:00 2001 From: Stefan Bratanov Date: Mon, 6 Nov 2023 13:59:18 +0000 Subject: [PATCH] use containerName --- .../builder/versions/bellatrix/BuilderBidSchemaBellatrix.java | 3 ++- .../builder/versions/deneb/BuilderBidSchemaDeneb.java | 3 ++- .../pegasys/teku/spec/schemas/SchemaDefinitionsBellatrix.java | 3 ++- .../pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java | 2 +- .../tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/bellatrix/BuilderBidSchemaBellatrix.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/bellatrix/BuilderBidSchemaBellatrix.java index 3044edb8d6a..5b0794521c0 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/bellatrix/BuilderBidSchemaBellatrix.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/bellatrix/BuilderBidSchemaBellatrix.java @@ -32,9 +32,10 @@ public class BuilderBidSchemaBellatrix implements BuilderBidSchema { public BuilderBidSchemaBellatrix( + final String containerName, final ExecutionPayloadHeaderSchema executionPayloadHeaderSchema) { super( - "BuilderBidBellatrix", + containerName, namedSchema( "header", SszSchema.as(ExecutionPayloadHeader.class, executionPayloadHeaderSchema)), namedSchema("value", SszPrimitiveSchemas.UINT256_SCHEMA), diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/deneb/BuilderBidSchemaDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/deneb/BuilderBidSchemaDeneb.java index 4d9204a8571..863ac456ed2 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/deneb/BuilderBidSchemaDeneb.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/builder/versions/deneb/BuilderBidSchemaDeneb.java @@ -42,10 +42,11 @@ public class BuilderBidSchemaDeneb implements BuilderBidSchema { public BuilderBidSchemaDeneb( + final String containerName, final SpecConfigDeneb specConfig, final ExecutionPayloadHeaderSchema executionPayloadHeaderSchema) { super( - "BuilderBidDeneb", + containerName, namedSchema( "header", SszSchema.as(ExecutionPayloadHeader.class, executionPayloadHeaderSchema)), namedSchema( diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsBellatrix.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsBellatrix.java index fec1d95e8eb..c3e5c3e8703 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsBellatrix.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsBellatrix.java @@ -72,7 +72,8 @@ public SchemaDefinitionsBellatrix(final SpecConfigBellatrix specConfig) { new SignedBeaconBlockSchema(beaconBlockSchema, "SignedBeaconBlockBellatrix"); this.signedBlindedBeaconBlockSchema = new SignedBeaconBlockSchema(blindedBeaconBlockSchema, "SignedBlindedBlockBellatrix"); - this.builderBidSchema = new BuilderBidSchemaBellatrix(executionPayloadHeaderSchema); + this.builderBidSchema = + new BuilderBidSchemaBellatrix("BuilderBidBellatrix", executionPayloadHeaderSchema); this.signedBuilderBidSchema = new SignedBuilderBidSchema("SignedBuilderBidBellatrix", builderBidSchema); } diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java index 58384c30302..e17633359ad 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsCapella.java @@ -99,7 +99,7 @@ public SchemaDefinitionsCapella(final SpecConfigCapella specConfig) { this.signedBlindedBeaconBlockSchema = new SignedBeaconBlockSchema(blindedBeaconBlockSchema, "SignedBlindedBlockCapella"); this.builderBidSchemaCapella = - new BuilderBidSchemaBellatrix(executionPayloadHeaderSchemaCapella); + new BuilderBidSchemaBellatrix("BuilderBidCapella", executionPayloadHeaderSchemaCapella); this.signedBuilderBidSchemaCapella = new SignedBuilderBidSchema("SignedBuilderBidCapella", builderBidSchemaCapella); this.historicalSummarySchema = new HistoricalSummary.HistoricalSummarySchema(); diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java index fcee186a70a..87db518fdbe 100644 --- a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java +++ b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/schemas/SchemaDefinitionsDeneb.java @@ -122,7 +122,7 @@ public SchemaDefinitionsDeneb(final SpecConfigDeneb specConfig) { this.blindedBlobsBundleSchema = new BlindedBlobsBundleSchema("BlindedBlobsBundleDeneb", specConfig); this.builderBidSchemaDeneb = - new BuilderBidSchemaDeneb(specConfig, executionPayloadHeaderSchemaDeneb); + new BuilderBidSchemaDeneb("BuilderBidDeneb", specConfig, executionPayloadHeaderSchemaDeneb); this.signedBuilderBidSchemaDeneb = new SignedBuilderBidSchema("SignedBuilderBidDeneb", builderBidSchemaDeneb);