-
Notifications
You must be signed in to change notification settings - Fork 299
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into fix-performance-tracker-single-attestation
- Loading branch information
Showing
6 changed files
with
223 additions
and
81 deletions.
There are no files selected for viewing
79 changes: 79 additions & 0 deletions
79
...a/tech/pegasys/teku/beaconrestapi/v2/beacon/PostAttestationsV2ElectraIntegrationTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| /* | ||
| * Copyright Consensys Software Inc., 2024 | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on | ||
| * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package tech.pegasys.teku.beaconrestapi.v2.beacon; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.Collections; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import okhttp3.Response; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import tech.pegasys.teku.beaconrestapi.handlers.v2.beacon.PostAttestationsV2; | ||
| import tech.pegasys.teku.infrastructure.json.JsonUtil; | ||
| import tech.pegasys.teku.infrastructure.json.types.SerializableTypeDefinition; | ||
| import tech.pegasys.teku.spec.SpecMilestone; | ||
| import tech.pegasys.teku.spec.TestSpecFactory; | ||
| import tech.pegasys.teku.spec.datastructures.operations.Attestation; | ||
| import tech.pegasys.teku.spec.datastructures.operations.SingleAttestation; | ||
| import tech.pegasys.teku.spec.schemas.SchemaDefinitionsElectra; | ||
| import tech.pegasys.teku.spec.util.DataStructureUtil; | ||
|
|
||
| public class PostAttestationsV2ElectraIntegrationTest extends PostAttestationsV2IntegrationTest { | ||
| protected SerializableTypeDefinition<List<SingleAttestation>> attestationsListTypeDef; | ||
|
|
||
| @Override | ||
| @BeforeEach | ||
| void setup() { | ||
| spec = TestSpecFactory.createMinimalElectra(); | ||
| specMilestone = SpecMilestone.ELECTRA; | ||
| startRestAPIAtGenesis(specMilestone); | ||
| dataStructureUtil = new DataStructureUtil(spec); | ||
| attestationsListTypeDef = | ||
| SerializableTypeDefinition.listOf( | ||
| SchemaDefinitionsElectra.required(spec.getGenesisSchemaDefinitions()) | ||
| .getSingleAttestationSchema() | ||
| .getJsonTypeDefinition()); | ||
| } | ||
|
|
||
| @Override | ||
| protected List<Attestation> getAttestationList(final int listSize) { | ||
| final List<Attestation> attestations = new ArrayList<>(listSize); | ||
| for (int i = 0; i < listSize; i++) { | ||
| attestations.add(dataStructureUtil.randomSingleAttestation()); | ||
| } | ||
| return attestations; | ||
| } | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| protected Response postAttestations(final List<?> attestations, final String milestone) | ||
| throws IOException { | ||
| final SerializableTypeDefinition<List<SingleAttestation>> attestationsListTypeDef = | ||
| SerializableTypeDefinition.listOf( | ||
| SchemaDefinitionsElectra.required(spec.getGenesisSchemaDefinitions()) | ||
| .getSingleAttestationSchema() | ||
| .getJsonTypeDefinition()); | ||
| if (milestone == null) { | ||
| return post( | ||
| PostAttestationsV2.ROUTE, | ||
| JsonUtil.serialize((List<SingleAttestation>) attestations, attestationsListTypeDef)); | ||
| } | ||
| return post( | ||
| PostAttestationsV2.ROUTE, | ||
| JsonUtil.serialize((List<SingleAttestation>) attestations, attestationsListTypeDef), | ||
| Collections.emptyMap(), | ||
| Optional.of(milestone)); | ||
| } | ||
| } |
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
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
28 changes: 28 additions & 0 deletions
28
...ation-test/resources/tech/pegasys/teku/beaconrestapi/beacon/schema/SingleAttestation.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| { | ||
| "title" : "SingleAttestation", | ||
| "type" : "object", | ||
| "required" : [ "committee_index", "attester_index", "data", "signature" ], | ||
| "properties" : { | ||
| "committee_index" : { | ||
| "type" : "string", | ||
| "description" : "unsigned 64 bit integer", | ||
| "example" : "1", | ||
| "format" : "uint64" | ||
| }, | ||
| "attester_index" : { | ||
| "type" : "string", | ||
| "description" : "unsigned 64 bit integer", | ||
| "example" : "1", | ||
| "format" : "uint64" | ||
| }, | ||
| "data" : { | ||
| "$ref" : "#/components/schemas/AttestationData" | ||
| }, | ||
| "signature" : { | ||
| "type" : "string", | ||
| "pattern" : "^0x[a-fA-F0-9]{2,}$", | ||
| "description" : "SSZ hexadecimal", | ||
| "format" : "bytes" | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.