fix rebase conflicts

Consensys · Aug 2, 2024 · 8a2c147 · 8a2c147
1 parent 98bec8a
commit 8a2c147
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
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
@@ -323,8 +323,7 @@ public SafeFuture<Optional<Attestation>> createAggregate(
     return sendRequest(
         () ->
             typeDefClient
-                .createAggregate(slot, attestationHashTreeRoot)
-                .map(attestation -> attestation.asInternalAttestation(spec)));
+                .createAggregate(slot, attestationHashTreeRoot));
   }
 
   @Override
@@ -453,6 +452,6 @@ public static RemoteValidatorApiHandler create(
     final OkHttpValidatorTypeDefClient typeDefClient =
         new OkHttpValidatorTypeDefClient(httpClient, endpoint, spec, preferSszBlockEncoding);
     return new RemoteValidatorApiHandler(
-        endpoint, apiClient, typeDefClient, asyncRunner, usePostValidatorsEndpoint);
+        endpoint, spec, apiClient, typeDefClient, asyncRunner, usePostValidatorsEndpoint);
   }
 }
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
@@ -113,7 +113,7 @@ class RemoteValidatorApiHandlerTest {
   @BeforeEach
   public void beforeEach() {
     apiHandler =
-        new RemoteValidatorApiHandler(endpoint, apiClient, typeDefClient, asyncRunner, true);
+        new RemoteValidatorApiHandler(endpoint, spec, apiClient, typeDefClient, asyncRunner, true);
   }
 
   @Test
@@ -652,7 +652,7 @@ public void createAggregate_ShouldUseV1ApiPreElectra() {
     asyncRunner.executeQueuedActions();
 
     verify(typeDefClient, never()).createAggregateV2(any(), any(), any());
-    verify(apiClient).createAggregate(slot, attHashTreeRoot);
+    verify(typeDefClient).createAggregate(slot, attHashTreeRoot);
   }
 
   @Test
@@ -668,7 +668,7 @@ public void createAggregate_ShouldUseV2ApiPostElectra() {
     ignoreFuture(apiHandler.createAggregate(slot, attHashTreeRoot, Optional.of(committeeIndex)));
     asyncRunner.executeQueuedActions();
 
-    verify(apiClient, never()).createAggregate(any(), any());
+    verify(typeDefClient, never()).createAggregate(any(), any());
     verify(typeDefClient).createAggregateV2(slot, attHashTreeRoot, committeeIndex);
   }