rename request

Consensys · Aug 2, 2024 · b8ec4ff · b8ec4ff
1 parent e9b0bc1
commit b8ec4ff
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/...GetAggregateAttestationRequestV2Test.java → ...ateAggregateAttestationRequestV2Test.java b/...GetAggregateAttestationRequestV2Test.java → ...ateAggregateAttestationRequestV2Test.java
@@ -43,16 +43,16 @@
 @TestSpecContext(
     milestone = {PHASE0, ELECTRA},
     network = Eth2Network.MINIMAL)
-public class GetAggregateAttestationRequestV2Test extends AbstractTypeDefRequestTestBase {
+public class CreateAggregateAttestationRequestV2Test extends AbstractTypeDefRequestTestBase {
 
-  private GetAggregateAttestationRequestV2 getAggregateAttestationRequestV2;
+  private CreateAggregateAttestationRequestV2 createAggregateAttestationRequestV2;
   private Buffer responseBodyBuffer;
   private final UInt64 slot = UInt64.ONE;
 
   @BeforeEach
   void setupRequest() {
-    getAggregateAttestationRequestV2 =
-        new GetAggregateAttestationRequestV2(mockWebServer.url("/"), okHttpClient, spec, slot);
+    createAggregateAttestationRequestV2 =
+        new CreateAggregateAttestationRequestV2(mockWebServer.url("/"), okHttpClient, spec, slot);
     responseBodyBuffer = new Buffer();
   }
 
@@ -69,7 +69,7 @@ public void getAggregateAttestation_makesExpectedRequest() throws Exception {
 
     mockWebServer.enqueue(new MockResponse().setResponseCode(SC_NO_CONTENT));
 
-    getAggregateAttestationRequestV2.createAggregate(attestationHashTreeRoot, committeeIndex);
+    createAggregateAttestationRequestV2.createAggregate(attestationHashTreeRoot, committeeIndex);
 
     final RecordedRequest request = mockWebServer.takeRequest();
 
@@ -85,9 +85,9 @@ public void getAggregateAttestation_makesExpectedRequest() throws Exception {
   @TestTemplate
   public void shouldGetAggregateAttestation() {
     final Attestation attestation = dataStructureUtil.randomAttestation();
-    final GetAggregateAttestationRequestV2.GetAggregateAttestationResponse
+    final CreateAggregateAttestationRequestV2.GetAggregateAttestationResponse
         getAggregateAttestationResponse =
-            new GetAggregateAttestationRequestV2.GetAggregateAttestationResponse(attestation);
+            new CreateAggregateAttestationRequestV2.GetAggregateAttestationResponse(attestation);
 
     final String mockResponse = readExpectedJsonResource(specMilestone);
 
@@ -100,7 +100,7 @@ public void shouldGetAggregateAttestation() {
             : attestation.getData().getIndex();
 
     final Optional<ObjectAndMetaData<Attestation>> maybeAttestationAndMetaData =
-        getAggregateAttestationRequestV2.createAggregate(
+        createAggregateAttestationRequestV2.createAggregate(
             attestation.hashTreeRoot(), committeeIndex);
     assertThat(maybeAttestationAndMetaData).isPresent();
     assertThat(maybeAttestationAndMetaData.get().getData())

diff --git a/...or/remote/src/main/java/tech/pegasys/teku/validator/remote/RemoteValidatorApiHandler.java b/...or/remote/src/main/java/tech/pegasys/teku/validator/remote/RemoteValidatorApiHandler.java
@@ -316,7 +316,7 @@ public SafeFuture<Optional<Attestation>> createAggregate(
       return sendRequest(
           () ->
               typeDefClient
-                  .createAggregate(slot, attestationHashTreeRoot, committeeIndex.get())
+                  .createAggregateV2(slot, attestationHashTreeRoot, committeeIndex.get())
                   .map(ObjectAndMetaData::getData));
     }
 

diff --git a/...rc/main/java/tech/pegasys/teku/validator/remote/typedef/OkHttpValidatorTypeDefClient.java b/...rc/main/java/tech/pegasys/teku/validator/remote/typedef/OkHttpValidatorTypeDefClient.java
@@ -50,10 +50,10 @@
 import tech.pegasys.teku.validator.api.SendSignedBlockResult;
 import tech.pegasys.teku.validator.api.required.SyncingStatus;
 import tech.pegasys.teku.validator.remote.typedef.handlers.BeaconCommitteeSelectionsRequest;
+import tech.pegasys.teku.validator.remote.typedef.handlers.CreateAggregateAttestationRequestV2;
 import tech.pegasys.teku.validator.remote.typedef.handlers.CreateAttestationDataRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.CreateBlockRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.CreateSyncCommitteeContributionRequest;
-import tech.pegasys.teku.validator.remote.typedef.handlers.GetAggregateAttestationRequestV2;
 import tech.pegasys.teku.validator.remote.typedef.handlers.GetPeerCountRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.GetProposerDutiesRequest;
 import tech.pegasys.teku.validator.remote.typedef.handlers.GetStateValidatorsRequest;
@@ -261,11 +261,11 @@ public void prepareBeaconProposer(
     prepareBeaconProposersRequest.submit(beaconPreparableProposers);
   }
 
-  public Optional<ObjectAndMetaData<Attestation>> createAggregate(
+  public Optional<ObjectAndMetaData<Attestation>> createAggregateV2(
       final UInt64 slot, final Bytes32 attestationHashTreeRoot, final UInt64 committeeIndex) {
-    GetAggregateAttestationRequestV2 getAggregateAttestationRequestV2 =
-        new GetAggregateAttestationRequestV2(getBaseEndpoint(), getOkHttpClient(), spec, slot);
-    return getAggregateAttestationRequestV2.createAggregate(
+    CreateAggregateAttestationRequestV2 createAggregateAttestationRequestV2 =
+        new CreateAggregateAttestationRequestV2(getBaseEndpoint(), getOkHttpClient(), spec, slot);
+    return createAggregateAttestationRequestV2.createAggregate(
         attestationHashTreeRoot, committeeIndex);
   }
 }
diff --git a/...ers/GetAggregateAttestationRequestV2.java → .../CreateAggregateAttestationRequestV2.java b/...ers/GetAggregateAttestationRequestV2.java → .../CreateAggregateAttestationRequestV2.java
@@ -33,7 +33,7 @@
 import tech.pegasys.teku.spec.datastructures.operations.AttestationSchema;
 import tech.pegasys.teku.validator.remote.typedef.ResponseHandler;
 
-public class GetAggregateAttestationRequestV2 extends AbstractTypeDefRequest {
+public class CreateAggregateAttestationRequestV2 extends AbstractTypeDefRequest {
 
   final AttestationSchema<Attestation> attestationSchema;
   final UInt64 slot;
@@ -43,7 +43,7 @@ public class GetAggregateAttestationRequestV2 extends AbstractTypeDefRequest {
   private final DeserializableTypeDefinition<GetAggregateAttestationResponse>
       getAggregateAttestationTypeDef;
 
-  public GetAggregateAttestationRequestV2(
+  public CreateAggregateAttestationRequestV2(
       final HttpUrl baseEndpoint,
       final OkHttpClient okHttpClient,
       final Spec spec,

diff --git a/...emote/src/test/java/tech/pegasys/teku/validator/remote/RemoteValidatorApiHandlerTest.java b/...emote/src/test/java/tech/pegasys/teku/validator/remote/RemoteValidatorApiHandlerTest.java
@@ -653,7 +653,7 @@ public void createAggregate_ShouldUseV1ApiPreElectra() {
     ignoreFuture(apiHandler.createAggregate(slot, attHashTreeRoot, Optional.empty()));
     asyncRunner.executeQueuedActions();
 
-    verify(typeDefClient, never()).createAggregate(any(), any(), any());
+    verify(typeDefClient, never()).createAggregateV2(any(), any(), any());
     verify(apiClient).createAggregate(slot, attHashTreeRoot);
   }
 
@@ -671,7 +671,7 @@ public void createAggregate_ShouldUseV2ApiPostElectra() {
     asyncRunner.executeQueuedActions();
 
     verify(apiClient, never()).createAggregate(any(), any());
-    verify(typeDefClient).createAggregate(slot, attHashTreeRoot, committeeIndex);
+    verify(typeDefClient).createAggregateV2(slot, attHashTreeRoot, committeeIndex);
   }
 
   @SuppressWarnings("unchecked")