fix-fix-misleading-sync-error (#9681)

Author: tbenr

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporter.java

@@ -89,7 +89,7 @@ public SafeFuture<BatchImportResult> importBatch(final Batch batch) {
                 if (lastBlockImportResult.isSuccessful()) {
                   return BatchImportResult.IMPORTED_ALL_BLOCKS;
                 } else if (lastBlockImportResult.hasFailedExecutingExecutionPayload()) {
-                  return BatchImportResult.SERVICE_OFFLINE;
+                  return BatchImportResult.EXECUTION_CLIENT_OFFLINE;
                 } else if (lastBlockImportResult.isDataNotAvailable()) {
                   return BatchImportResult.DATA_NOT_AVAILABLE;
                 }
@@ -145,7 +145,7 @@ private SafeFuture<BlockImportResult> importBlock(
   public enum BatchImportResult {
     IMPORTED_ALL_BLOCKS,
     IMPORT_FAILED,
-    SERVICE_OFFLINE,
+    EXECUTION_CLIENT_OFFLINE,
     DATA_NOT_AVAILABLE;
 
     public boolean isFailure() {

beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchSync.java

@@ -433,10 +433,10 @@ private void onImportComplete(
         LOG.debug("Marking batch {} as invalid because it extends from an invalid block", batch);
         batch.markAsInvalid();
       }
-    } else if (result == BatchImportResult.SERVICE_OFFLINE
+    } else if (result == BatchImportResult.EXECUTION_CLIENT_OFFLINE
         || result == BatchImportResult.DATA_NOT_AVAILABLE) {
       if (!scheduledProgressSync) {
-        LOG.warn("Unable to import blocks because execution client is offline.");
+        LOG.warn("Unable to import blocks: {}", result);
         asyncRunner
             .runAfterDelay(
                 () ->

beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporterTest.java

@@ -240,9 +240,9 @@ void shouldNotDisconnectPeersWhenServiceOffline() {
     ignoreFuture(verify(blockImporter).importBlock(block2));
     verifyNoMoreInteractions(blockImporter);
 
-    // Import failed due to service being offline
+    // Import failed due to execution being offline
     importResult2.complete(BlockImportResult.failedExecutionPayloadExecution(new Error()));
-    assertThat(result).isCompletedWithValue(BatchImportResult.SERVICE_OFFLINE);
+    assertThat(result).isCompletedWithValue(BatchImportResult.EXECUTION_CLIENT_OFFLINE);
     verify(batch).getSource();
     verify(syncSource, never()).disconnectCleanly(any());
 

beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchSyncTest.java

@@ -21,9 +21,9 @@
 import static org.mockito.Mockito.verifyNoInteractions;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+import static tech.pegasys.teku.beacon.sync.forward.multipeer.BatchImporter.BatchImportResult.EXECUTION_CLIENT_OFFLINE;
 import static tech.pegasys.teku.beacon.sync.forward.multipeer.BatchImporter.BatchImportResult.IMPORTED_ALL_BLOCKS;
 import static tech.pegasys.teku.beacon.sync.forward.multipeer.BatchImporter.BatchImportResult.IMPORT_FAILED;
-import static tech.pegasys.teku.beacon.sync.forward.multipeer.BatchImporter.BatchImportResult.SERVICE_OFFLINE;
 import static tech.pegasys.teku.beacon.sync.forward.multipeer.batches.BatchAssert.assertThatBatch;
 import static tech.pegasys.teku.beacon.sync.forward.multipeer.chains.TargetChainTestUtil.chainWith;
 import static tech.pegasys.teku.infrastructure.async.SafeFuture.completedFuture;
@@ -939,7 +939,7 @@ void shouldPauseImportingWhenImportingServiceOffline() {
         batch2, chainBuilder.generateBlockAtSlot(batch2.getFirstSlot()).getBlock());
 
     // But then it turns out that a batch0 is not processed because importing is offline
-    batches.getImportResult(batch0).complete(SERVICE_OFFLINE);
+    batches.getImportResult(batch0).complete(EXECUTION_CLIENT_OFFLINE);
 
     // This shouldn't make batches invalid
     batches.assertNotMarkedInvalid(batch0);