Execute TaskUpdateManager tests on a running MongoDB container (#682)

Author: jbern0rd

CHANGELOG.md

@@ -20,6 +20,7 @@ All notable changes to this project will be documented in this file.
 - Add logs for better traceability. (#675)
 - Remove code only used in tests from `TaskService` and `Task`. (#678 #679)
 - Implement each task status transition in a single method. (#680)
+- Execute `TaskUpdateManager` tests on a running MongoDB container. (#682)
 
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.4.0) 2024-02-29
 

src/main/java/com/iexec/core/replicate/Replicate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2024 IEXEC BLOCKCHAIN TECH
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,6 @@
 import static com.iexec.common.replicate.ReplicateStatus.WORKER_LOST;
 import static com.iexec.common.replicate.ReplicateStatusUpdate.poolManagerRequest;
 
-
 @Data
 @NoArgsConstructor
 @JsonIgnoreProperties(ignoreUnknown = true)
@@ -85,11 +84,6 @@ public ReplicateStatus getLastRelevantStatus() {
         throw new NoReplicateStatusException(chainTaskId);
     }
 
-    @JsonIgnore
-    public ReplicateStatus getLastButOneStatus() {
-        return statusUpdateList.get(statusUpdateList.size() - 2).getStatus();
-    }
-
     @JsonIgnore
     private ReplicateStatusUpdate getLatestStatusUpdate() {
         return statusUpdateList.get(statusUpdateList.size() - 1);

src/main/java/com/iexec/core/task/Task.java

@@ -31,9 +31,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Optional;
 
-import static com.iexec.core.task.TaskStatus.CONSENSUS_REACHED;
 import static com.iexec.core.task.TaskStatus.RECEIVED;
 
 @Document
@@ -126,31 +124,6 @@ public TaskStatusChange getLatestStatusChange() {
         return this.getDateStatusList().get(this.getDateStatusList().size() - 1);
     }
 
-    @JsonIgnore
-    public TaskStatus getLastButOneStatus() {
-        return this.getDateStatusList().get(this.getDateStatusList().size() - 2).getStatus();
-    }
-
-    public boolean isConsensusReachedSinceMultiplePeriods(int nbOfPeriods) {
-        Optional<Date> consensusReachedDate = this.getDateOfStatus(CONSENSUS_REACHED);
-        if (consensusReachedDate.isEmpty()) {
-            return false;
-        }
-        Date onePeriodAfterConsensusReachedDate = new Date(consensusReachedDate.get().getTime() + nbOfPeriods * this.maxExecutionTime);
-        Date now = new Date();
-
-        return now.after(onePeriodAfterConsensusReachedDate);
-    }
-
-    public Optional<Date> getDateOfStatus(TaskStatus taskStatus) {
-        for (TaskStatusChange taskStatusChange : this.dateStatusList) {
-            if (taskStatusChange.getStatus().equals(taskStatus)) {
-                return Optional.of(taskStatusChange.getDate());
-            }
-        }
-        return Optional.empty();
-    }
-
     public boolean isContributionDeadlineReached() {
         return new Date().after(contributionDeadline);
     }

src/main/java/com/iexec/core/task/update/TaskUpdateManager.java

@@ -546,6 +546,9 @@ void reopening2Reopened(Task task, ChainReceipt chainReceipt) {
 
             task.setConsensus(null);
             task.setRevealDeadline(new Date(0));
+            taskService.updateTask(task.getChainTaskId(), task.getCurrentStatus(),
+                    Update.update("consensus", null)
+                            .set("revealDeadline", new Date(0)));
 
             updateTaskStatusAndSave(task, REOPENED, chainReceipt);
             updateTaskStatusAndSave(task, INITIALIZED, chainReceipt);

src/test/java/com/iexec/core/task/TaskTests.java

@@ -21,9 +21,7 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Date;
-import java.util.List;
 
-import static com.iexec.core.task.TaskStatus.CONSENSUS_REACHED;
 import static com.iexec.core.task.TaskTestsUtils.COMMAND_LINE;
 import static com.iexec.core.task.TaskTestsUtils.DAPP_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
@@ -38,34 +36,6 @@ void shouldInitializeProperly() {
         assertThat(task.getDateStatusList().get(0).getStatus()).isEqualTo(TaskStatus.RECEIVED);
     }
 
-    @Test
-    void shouldReturnTrueWhenConsensusReachedSinceAWhile() {
-        final long maxExecutionTime = 60;
-        Task task = new Task();
-        task.setMaxExecutionTime(maxExecutionTime);
-        TaskStatusChange taskStatusChange = TaskStatusChange.builder()
-                .status(CONSENSUS_REACHED)
-                .date(Date.from(Instant.now().minus(2 * maxExecutionTime, ChronoUnit.MILLIS)))
-                .build();
-        task.setDateStatusList(List.of(taskStatusChange));
-
-        assertThat(task.isConsensusReachedSinceMultiplePeriods(1)).isTrue();
-    }
-
-    @Test
-    void shouldReturnFalseWhenConsensusReachedSinceNotLong() {
-        final long maxExecutionTime = 60;
-        Task task = new Task();
-        task.setMaxExecutionTime(maxExecutionTime);
-        TaskStatusChange taskStatusChange = TaskStatusChange.builder()
-                .status(CONSENSUS_REACHED)
-                .date(Date.from(Instant.now().minus(10L, ChronoUnit.MILLIS)))
-                .build();
-        task.setDateStatusList(List.of(taskStatusChange));
-
-        assertThat(task.isConsensusReachedSinceMultiplePeriods(1)).isFalse();
-    }
-
     @Test
     void shouldContributionDeadlineBeReached() {
         Task task = new Task();