Check result has been uploaded for TEE tasks

CHANGELOG.md

@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 ### Bug Fixes
 
 - Keep a single `updateReplicateStatus` method in `ReplicatesService`. (#670)
+- Check result has been uploaded for TEE tasks. (#671)
 
 ## [[8.4.0]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.4.0) 2024-02-29
 

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

@@ -551,17 +551,12 @@ public boolean isResultUploaded(String chainTaskId) {
     }
 
     public boolean isResultUploaded(TaskDescription task) {
-        // Offchain computing - basic & tee
+        // Offchain computing - basic & TEE
         if (task.containsCallback()) {
             return true;
         }
 
-        // Cloud computing - tee
-        if (task.isTeeTask()) {
-            return true; // pushed from enclave
-        }
-
-        // Cloud computing - basic
+        // Cloud computing - basic & TEE
         return resultService.isResultUploaded(task.getChainTaskId());
     }
 

src/test/java/com/iexec/core/replicate/ReplicateServiceTests.java

@@ -30,6 +30,8 @@
 import io.vavr.control.Either;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -796,12 +798,13 @@ void shouldGetReplicateWithResultUploadedStatus() {
 
     // region isResultUploaded
 
-    @Test
-    void shouldCheckResultServiceAndReturnTrue() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void shouldCheckResultServiceAndReturnTrue(boolean isTeeTask) {
         TaskDescription taskDescription = TaskDescription.builder()
                 .chainTaskId(CHAIN_TASK_ID)
                 .callback(BytesUtils.EMPTY_ADDRESS)
-                .isTeeTask(false)
+                .isTeeTask(isTeeTask)
                 .build();
         when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
                 .thenReturn(taskDescription);
@@ -812,12 +815,13 @@ void shouldCheckResultServiceAndReturnTrue() {
         verify(resultService).isResultUploaded(CHAIN_TASK_ID);
     }
 
-    @Test
-    void shouldCheckResultServiceAndReturnFalse() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void shouldCheckResultServiceAndReturnFalse(boolean isTeeTask) {
         TaskDescription taskDescription = TaskDescription.builder()
                 .chainTaskId(CHAIN_TASK_ID)
                 .callback(BytesUtils.EMPTY_ADDRESS)
-                .isTeeTask(false)
+                .isTeeTask(isTeeTask)
                 .build();
         when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
                 .thenReturn(taskDescription);
@@ -838,27 +842,13 @@ void shouldReturnFalseSinceTaskNotFound() {
         verify(resultService, never()).isResultUploaded(CHAIN_TASK_ID);
     }
 
-    @Test
-    void shouldReturnTrueForCallbackTask() {
+    @ParameterizedTest
+    @ValueSource(booleans = {true, false})
+    void shouldReturnTrueForCallbackTask(boolean isTeeTask) {
         TaskDescription taskDescription = TaskDescription.builder()
                 .chainTaskId(CHAIN_TASK_ID)
                 .callback("callback")
-                .isTeeTask(false)
-                .build();
-        when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
-                .thenReturn(taskDescription);
-
-        boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
-        assertThat(isResultUploaded).isTrue();
-        verify(resultService, never()).isResultUploaded(CHAIN_TASK_ID);
-    }
-
-    @Test
-    void shouldReturnTrueForTeeTask() {
-        TaskDescription taskDescription = TaskDescription.builder()
-                .chainTaskId(CHAIN_TASK_ID)
-                .callback(BytesUtils.EMPTY_ADDRESS)
-                .isTeeTask(true)
+                .isTeeTask(isTeeTask)
                 .build();
         when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
                 .thenReturn(taskDescription);
@@ -1017,24 +1007,6 @@ void shouldNotAuthorizeUpdateOnResultUploadFailedSinceResultUploadedWithCallback
                 .isEqualTo(ReplicateStatusUpdateError.GENERIC_CANT_UPDATE);
     }
 
-    @Test
-    void shouldNotAuthorizeUpdateOnResultUploadFailedSinceResultUploadedWithTee() {
-        Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
-        replicate.updateStatus(RESULT_UPLOADING, ReplicateStatusModifier.WORKER);
-
-        ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
-                .modifier(WORKER)
-                .status(RESULT_UPLOAD_FAILED)
-                .build();
-        UpdateReplicateStatusArgs updateReplicateStatusArgs = UpdateReplicateStatusArgs
-                .builder()
-                .taskDescription(TaskDescription.builder().isTeeTask(true).build())
-                .build();
-
-        assertThat(replicatesService.canUpdateReplicateStatus(replicate, statusUpdate, updateReplicateStatusArgs))
-                .isEqualTo(ReplicateStatusUpdateError.GENERIC_CANT_UPDATE);
-    }
-
     @Test
     void shouldNotAuthorizeUpdateOnContributedSinceNoBlockAvailable() {
         final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
@@ -1229,6 +1201,7 @@ void shouldAuthorizeUpdateOnContributeAndFinalizeDone() {
                 .thenReturn(true);
         when(iexecHubService.getTaskDescription(CHAIN_TASK_ID)).thenReturn(task);
         when(iexecHubService.isTaskInCompletedStatusOnChain(CHAIN_TASK_ID)).thenReturn(true);
+        when(resultService.isResultUploaded(CHAIN_TASK_ID)).thenReturn(true);
 
         assertThat(replicatesService.canUpdateReplicateStatus(replicate, statusUpdate, null))
                 .isEqualTo(ReplicateStatusUpdateError.NO_ERROR);