fix: remove circuit-break on failed worker transaction to allow replicate abortion (#767)

Author: jbern0rd

src/main/java/com/iexec/core/replicate/listener/ReplicateListeners.java

@@ -21,7 +21,6 @@
 import com.iexec.common.replicate.ReplicateStatusUpdate;
 import com.iexec.core.detector.replicate.ContributionUnnotifiedDetector;
 import com.iexec.core.replicate.ReplicateUpdatedEvent;
-import com.iexec.core.replicate.ReplicatesService;
 import com.iexec.core.task.update.TaskUpdateRequestManager;
 import com.iexec.core.worker.WorkerService;
 import lombok.extern.slf4j.Slf4j;
@@ -40,16 +39,13 @@ public class ReplicateListeners {
     private final TaskUpdateRequestManager taskUpdateRequestManager;
     private final WorkerService workerService;
     private final ContributionUnnotifiedDetector contributionUnnotifiedDetector;
-    private final ReplicatesService replicatesService;
 
     public ReplicateListeners(final WorkerService workerService,
                               final TaskUpdateRequestManager taskUpdateRequestManager,
-                              final ContributionUnnotifiedDetector contributionUnnotifiedDetector,
-                              final ReplicatesService replicatesService) {
+                              final ContributionUnnotifiedDetector contributionUnnotifiedDetector) {
         this.workerService = workerService;
         this.taskUpdateRequestManager = taskUpdateRequestManager;
         this.contributionUnnotifiedDetector = contributionUnnotifiedDetector;
-        this.replicatesService = replicatesService;
     }
 
     @EventListener
@@ -92,14 +88,6 @@ public void onReplicateUpdatedEvent(final ReplicateUpdatedEvent event) {
             contributionUnnotifiedDetector.detectOnchainDone();
         }
 
-        /*
-         * Should add FAILED status if not completable
-         */
-        if (ReplicateStatus.getUncompletableStatuses().contains(newStatus)) {
-            replicatesService.updateReplicateStatus(event.getChainTaskId(),
-                    event.getWalletAddress(), ReplicateStatusUpdate.poolManagerRequest(FAILED));
-        }
-
         /*
          * Should release given worker for this replicate if status is COMPLETED or FAILED
          */

src/test/java/com/iexec/core/replicate/listener/ReplicateListenersTests.java

@@ -20,28 +20,20 @@
 import com.iexec.common.replicate.ReplicateStatusUpdate;
 import com.iexec.core.detector.replicate.ContributionUnnotifiedDetector;
 import com.iexec.core.replicate.ReplicateUpdatedEvent;
-import com.iexec.core.replicate.ReplicatesService;
 import com.iexec.core.task.update.TaskUpdateRequestManager;
 import com.iexec.core.worker.WorkerService;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.function.Predicate;
-import java.util.stream.Stream;
 
 import static com.iexec.common.replicate.ReplicateStatus.*;
 import static com.iexec.common.replicate.ReplicateStatusCause.TASK_NOT_ACTIVE;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
@@ -55,8 +47,6 @@ class ReplicateListenersTests {
     @Mock
     private ContributionUnnotifiedDetector contributionUnnotifiedDetector;
     @Mock
-    private ReplicatesService replicatesService;
-    @Mock
     private TaskUpdateRequestManager taskUpdateRequestManager;
     @InjectMocks
     private ReplicateListeners replicateListeners;
@@ -154,35 +144,6 @@ void shouldNotTriggerDetectOnchainContributedSinceCauseIsNull() {
         verifyNoInteractions(contributionUnnotifiedDetector);
     }
 
-    static Stream<ReplicateStatus> getUncompletableStatuses() {
-        return ReplicateStatus.getUncompletableStatuses().stream();
-    }
-
-    @ParameterizedTest
-    @MethodSource("getUncompletableStatuses")
-    void shouldAddFailedStatusSinceUncompletableReplicateStatus(final ReplicateStatus uncompletableStatus) {
-        final ReplicateUpdatedEvent replicateUpdatedEvent = getMockReplicate(uncompletableStatus);
-        replicateListeners.onReplicateUpdatedEvent(replicateUpdatedEvent);
-
-        final ArgumentCaptor<ReplicateStatusUpdate> statusUpdate = ArgumentCaptor.forClass(ReplicateStatusUpdate.class);
-        verify(replicatesService).updateReplicateStatus(eq(CHAIN_TASK_ID), eq(WORKER_WALLET), statusUpdate.capture());
-        assertThat(statusUpdate.getValue().getStatus()).isEqualTo(FAILED);
-    }
-
-    static Stream<ReplicateStatus> getCompletableStatuses() {
-        return Arrays.stream(values())
-                .filter(Predicate.not(ReplicateStatus.getUncompletableStatuses()::contains));
-    }
-
-    @ParameterizedTest
-    @MethodSource("getCompletableStatuses")
-    void shouldNotAddFailedStatusSinceCompletableReplicateStatus(final ReplicateStatus completableStatus) {
-        final ReplicateUpdatedEvent replicateUpdatedEvent = getMockReplicate(completableStatus);
-        replicateListeners.onReplicateUpdatedEvent(replicateUpdatedEvent);
-
-        verifyNoInteractions(replicatesService);
-    }
-
     @Test
     void shouldRemoveChainTaskIdFromWorkerSinceCompleted() {
         final ReplicateUpdatedEvent replicateUpdatedEvent = getMockReplicate(COMPLETED);