fix: do not check worker deposit against required worker stake for contributeAndFinalize workflow (#652)

Author: jbern0rd

src/main/java/com/iexec/worker/chain/ContributionService.java

@@ -59,12 +59,16 @@ public Optional<ReplicateStatusCause> getCannotContributeStatusCause(final Strin
             return Optional.of(WORKERPOOL_AUTHORIZATION_NOT_FOUND);
         }
 
+        final TaskDescription taskDescription = iexecHubService.getTaskDescription(chainTaskId);
+
         final ChainTask chainTask = iexecHubService.getChainTask(chainTaskId).orElse(null);
         if (chainTask == null) {
             return Optional.of(CHAIN_UNREACHABLE);
         }
 
-        if (!hasEnoughStakeToContribute(chainTask)) {
+        // No staking in contributeAndFinalize
+        if (taskDescription != null && !taskDescription.isEligibleToContributeAndFinalize()
+                && !hasEnoughStakeToContribute(chainTask)) {
             return Optional.of(STAKE_TOO_LOW);
         }
 

src/test/java/com/iexec/worker/chain/ContributionServiceTests.java

@@ -41,8 +41,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 class ContributionServiceTests {
@@ -116,6 +115,7 @@ void getCannotContributeStatusShouldReturnChainUnreachable() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.empty());
 
         assertThat(contributionService.getCannotContributeStatusCause(chainTaskId).orElse(null))
@@ -130,6 +130,7 @@ void getCannotContributeStatusShouldReturnStakeTooLow() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.of(chainTask));
         when(iexecHubService.getChainAccount()).thenReturn(Optional.of(ChainAccount.builder().deposit(0).build()));
         when(iexecHubService.getChainDeal(CHAIN_DEAL_ID)).thenReturn(Optional.of(ChainDeal.builder().workerStake(BigInteger.valueOf(5)).build()));
@@ -153,6 +154,7 @@ void getCannotContributeStatusShouldReturnTaskNotActive() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.of(inactiveTask));
         when(iexecHubService.getChainAccount()).thenReturn(Optional.of(ChainAccount.builder().deposit(1000).build()));
         when(iexecHubService.getChainDeal(CHAIN_DEAL_ID)).thenReturn(Optional.of(ChainDeal.builder().workerStake(BigInteger.valueOf(5)).build()));
@@ -177,6 +179,7 @@ void getCannotContributeStatusShouldReturnAfterDeadline() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.of(timedOutChainTask));
         when(iexecHubService.getChainAccount())
                 .thenReturn(Optional.of(ChainAccount.builder().deposit(1000).build()));
@@ -204,6 +207,7 @@ void getCannotContributeStatusShouldReturnContributionAlreadySet() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.of(alreadyContributedChainTask));
         when(iexecHubService.getChainAccount())
                 .thenReturn(Optional.of(ChainAccount.builder().deposit(1000).build()));
@@ -224,6 +228,7 @@ void getCannotContributeStatusCauseShouldReturnEmpty() {
 
         when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
                 .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(taskDescription);
         when(iexecHubService.getChainTask(chainTaskId))
                 .thenReturn(Optional.of(chainTask));
         when(iexecHubService.getChainAccount())
@@ -238,6 +243,26 @@ void getCannotContributeStatusCauseShouldReturnEmpty() {
         verify(iexecHubService).getChainDeal(CHAIN_DEAL_ID);
         verify(workerpoolAuthorizationService).getWorkerpoolAuthorization(chainTaskId);
     }
+
+    @Test
+    void getCannotContributeStatusShouldReturnEmptyForContributeAndFinalizeFlow() {
+        final String chainTaskId = chainTask.getChainTaskId();
+        final TaskDescription contributeAndFinalizeTaskDescription = TaskDescription.builder()
+                .trust(BigInteger.ONE)
+                .isTeeTask(true)
+                .build();
+
+        when(workerpoolAuthorizationService.getWorkerpoolAuthorization(chainTaskId))
+                .thenReturn(getTeeWorkerpoolAuth());
+        when(iexecHubService.getTaskDescription(chainTaskId)).thenReturn(contributeAndFinalizeTaskDescription);
+        when(iexecHubService.getChainTask(chainTaskId)).thenReturn(Optional.of(chainTask));
+
+        assertThat(contributionService.getCannotContributeStatusCause(chainTaskId)).isEmpty();
+
+        verify(iexecHubService).getChainTask(chainTaskId);
+        verify(iexecHubService, never()).getChainAccount();
+        verify(iexecHubService, never()).getChainDeal(CHAIN_DEAL_ID);
+    }
     //endregion
 
     // region getCannotContributeAndFinalizeStatusCause