Merge branch 'master' into notification-type-for-recovery

Author: Ugo Plouviez

src/main/java/com/iexec/worker/amnesia/AmnesiaRecoveryService.java

@@ -52,25 +52,23 @@ public List<String> recoverInterruptedReplicates() {
         }
 
         for (TaskNotification missedTaskNotification : missedTaskNotifications) {
-
-            ContributionAuthorization contributionAuth = missedTaskNotification.getTaskNotificationExtra().getContributionAuthorization();
             TaskNotificationType taskNotificationType = missedTaskNotification.getTaskNotificationType();
-            String chainTaskId = contributionAuth.getChainTaskId();
+            String chainTaskId = missedTaskNotification.getChainTaskId();
             boolean isResultAvailable = resultService.isResultAvailable(chainTaskId);
 
             log.info("Recovering interrupted task [chainTaskId:{}, taskNotificationType:{}]",
                     chainTaskId, taskNotificationType);
 
             if (!isResultAvailable && taskNotificationType != TaskNotificationType.PLEASE_CONTRIBUTE) {
-                log.error("Could not recover task, result not found [chainTaskId:{}, RecoveryAction:{}]",
+                log.error("Could not recover task, result not found [chainTaskId:{}, taskNotificationType:{}]",
                         chainTaskId, taskNotificationType);
                 continue;
             }
 
             Optional<TaskDescription> optionalTaskDescription = iexecHubService.getTaskDescriptionFromChain(chainTaskId);
 
             if (!optionalTaskDescription.isPresent()) {
-                log.error("Could not recover task, no replicateModel retrieved [chainTaskId:{}, RecoveryAction:{}]",
+                log.error("Could not recover task, no TaskDescription retrieved [chainTaskId:{}, taskNotificationType:{}]",
                         chainTaskId, taskNotificationType);
                 continue;
             }

src/main/java/com/iexec/worker/executor/TaskExecutorService.java

@@ -7,12 +7,12 @@
 import com.iexec.common.replicate.ReplicateStatus;
 import com.iexec.common.security.Signature;
 import com.iexec.common.task.TaskDescription;
-import com.iexec.common.utils.BytesUtils;
 import com.iexec.common.utils.SignatureUtils;
 import com.iexec.worker.chain.ContributionService;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.chain.RevealService;
 import com.iexec.worker.chain.Web3jService;
+import com.iexec.worker.config.PublicConfigurationService;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.dataset.DatasetService;
 import com.iexec.worker.docker.DockerComputationService;
@@ -52,12 +52,14 @@ public class TaskExecutorService {
     private IexecHubService iexecHubService;
     private SmsService smsService;
     private Web3jService web3jService;
+    private PublicConfigurationService publicConfigurationService;
 
     // internal variables
     private int maxNbExecutions;
     private ThreadPoolExecutor executor;
     private String corePublicAddress;
 
+    //TODO make this fat constructor lose weight
     public TaskExecutorService(DatasetService datasetService,
                                DockerComputationService dockerComputationService,
                                ResultService resultService,
@@ -67,7 +69,8 @@ public TaskExecutorService(DatasetService datasetService,
                                WorkerConfigurationService workerConfigurationService,
                                IexecHubService iexecHubService,
                                SmsService smsService,
-                               Web3jService web3jService) {
+                               Web3jService web3jService,
+                               PublicConfigurationService publicConfigurationService) {
         this.datasetService = datasetService;
         this.dockerComputationService = dockerComputationService;
         this.resultService = resultService;
@@ -78,14 +81,15 @@ public TaskExecutorService(DatasetService datasetService,
         this.iexecHubService = iexecHubService;
         this.smsService = smsService;
         this.web3jService = web3jService;
+        this.publicConfigurationService = publicConfigurationService;
 
         maxNbExecutions = Runtime.getRuntime().availableProcessors() - 1;
         executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(maxNbExecutions);
     }
 
     @PostConstruct
     public void initIt() {
-        corePublicAddress = customFeignClient.getPublicConfiguration().getSchedulerPublicAddress();
+        corePublicAddress = publicConfigurationService.getSchedulerPublicAddress();
     }
 
     public boolean canAcceptMoreReplicates() {
@@ -145,7 +149,7 @@ private String compute(ContributionAuthorization contributionAuth) {
 
         Optional<TaskDescription> taskDescriptionFromChain = iexecHubService.getTaskDescriptionFromChain(chainTaskId);
 
-        if (!taskDescriptionFromChain.isPresent()){
+        if (!taskDescriptionFromChain.isPresent()) {
             stdout = "AvailableReplicateModel not found";
             log.error(stdout + " [chainTaskId:{}]", chainTaskId);
             return stdout;
@@ -276,7 +280,7 @@ public void contribute(ContributionAuthorization contribAuth) {
 
         if (oChainReceipt.get().getBlockNumber() == 0) {
             log.warn("The blocknumber of the receipt is equal to 0, the CONTRIBUTED status will not be " +
-                            "sent to the core [chainTaskId:{}]", chainTaskId);
+                    "sent to the core [chainTaskId:{}]", chainTaskId);
             return;
         }