Add iexec-core-library dependency and use it (#595)

Author: jbern0rd

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/vNEXT) 2024
 
+### New Features
+
+- Use `iexec-core-library` in `iexec-worker`. (#595)
+
 ### Bug fixes
 
 - Fix `LoginServiceTests#shouldLoginOnceOnSimultaneousCalls` test. (#587)

build.gradle

@@ -52,6 +52,7 @@ dependencies {
     implementation "com.iexec.blockchain:iexec-blockchain-adapter-api-library:$iexecBlockchainAdapterVersion"
     implementation "com.iexec.result-proxy:iexec-result-proxy-library:$iexecResultVersion"
     implementation "com.iexec.sms:iexec-sms-library:$iexecSmsVersion"
+    implementation "com.iexec.core:iexec-core-library:$iexecCoreVersion"
 
     // spring
     implementation "org.springframework.boot:spring-boot-starter"

gradle.properties

@@ -5,6 +5,7 @@ iexecCommonsPocoVersion=3.2.0
 iexecBlockchainAdapterVersion=8.4.0
 iexecResultVersion=8.4.0
 iexecSmsVersion=8.5.0
+iexecCoreVersion=8.4.1-NEXT-SNAPSHOT
 
 nexusUser
 nexusPassword

src/main/java/com/iexec/worker/PingService.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.
@@ -16,9 +16,9 @@
 
 package com.iexec.worker;
 
+import com.iexec.core.api.SchedulerClient;
 import com.iexec.worker.config.CoreConfigurationService;
 import com.iexec.worker.feign.LoginService;
-import com.iexec.worker.feign.client.CoreClient;
 import com.iexec.worker.utils.AsyncUtils;
 import com.iexec.worker.utils.ExecutorUtils;
 import com.iexec.worker.worker.WorkerService;
@@ -38,12 +38,12 @@ public class PingService {
     private static final int PING_RATE_IN_SECONDS = 10;
 
     private final Executor executor;
-    private final CoreClient coreClient;
+    private final SchedulerClient coreClient;
     private final CoreConfigurationService coreConfigurationService;
     private final LoginService loginService;
     private final WorkerService workerService;
 
-    public PingService(CoreClient coreClient,
+    public PingService(SchedulerClient coreClient,
                        CoreConfigurationService coreConfigurationService,
                        LoginService loginService,
                        WorkerService workerService) {
@@ -105,8 +105,8 @@ void pingScheduler() {
         }
         if (!sessionId.equalsIgnoreCase(currentSessionId)) {
             // need to reconnect to the core by restarting the worker
-            log.warn("Scheduler seems to have restarted [currentSessionId:{}, " +
-                    "coreSessionId:{}]", currentSessionId, sessionId);
+            log.warn("Scheduler seems to have restarted [currentSessionId:{}, coreSessionId:{}]",
+                    currentSessionId, sessionId);
             workerService.restartGracefully();
         }
     }

src/main/java/com/iexec/worker/config/CoreConfigurationService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 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.
@@ -16,7 +16,11 @@
 
 package com.iexec.worker.config;
 
+import com.iexec.core.api.SchedulerClient;
+import com.iexec.core.api.SchedulerClientBuilder;
+import feign.Logger;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
@@ -67,4 +71,9 @@ public String getCoreSessionId() {
     public void setCoreSessionId(String coreSessionId) {
         this.coreSessionId = coreSessionId;
     }
+
+    @Bean
+    SchedulerClient schedulerClient() {
+        return SchedulerClientBuilder.getInstance(Logger.Level.FULL, url.toString());
+    }
 }

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

@@ -22,8 +22,8 @@
 import com.iexec.common.result.ComputedFile;
 import com.iexec.commons.poco.chain.ChainReceipt;
 import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
-import com.iexec.commons.poco.notification.TaskNotificationExtra;
 import com.iexec.commons.poco.task.TaskDescription;
+import com.iexec.core.notification.TaskNotificationExtra;
 import com.iexec.worker.chain.ContributionService;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.chain.RevealService;

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

@@ -18,11 +18,11 @@
 
 import com.iexec.common.replicate.*;
 import com.iexec.commons.poco.chain.ChainTask;
-import com.iexec.commons.poco.notification.TaskNotification;
-import com.iexec.commons.poco.notification.TaskNotificationExtra;
-import com.iexec.commons.poco.notification.TaskNotificationType;
 import com.iexec.commons.poco.task.TaskAbortCause;
 import com.iexec.commons.poco.task.TaskDescription;
+import com.iexec.core.notification.TaskNotification;
+import com.iexec.core.notification.TaskNotificationExtra;
+import com.iexec.core.notification.TaskNotificationType;
 import com.iexec.worker.chain.IexecHubService;
 import com.iexec.worker.chain.WorkerpoolAuthorizationService;
 import com.iexec.worker.feign.CustomCoreFeignClient;
@@ -43,7 +43,6 @@
 import static com.iexec.common.replicate.ReplicateStatus.*;
 import static com.iexec.common.replicate.ReplicateStatusCause.TASK_DESCRIPTION_NOT_FOUND;
 
-
 @Slf4j
 @Service
 public class TaskNotificationService {

src/main/java/com/iexec/worker/feign/CustomCoreFeignClient.java

@@ -20,9 +20,9 @@
 import com.iexec.common.config.WorkerModel;
 import com.iexec.common.replicate.ReplicateStatusUpdate;
 import com.iexec.common.replicate.ReplicateTaskSummary;
-import com.iexec.commons.poco.notification.TaskNotification;
-import com.iexec.commons.poco.notification.TaskNotificationType;
-import com.iexec.worker.feign.client.CoreClient;
+import com.iexec.core.api.SchedulerClient;
+import com.iexec.core.notification.TaskNotification;
+import com.iexec.core.notification.TaskNotificationType;
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -36,9 +36,9 @@
 public class CustomCoreFeignClient extends BaseFeignClient {
 
     private final LoginService loginService;
-    private final CoreClient coreClient;
+    private final SchedulerClient coreClient;
 
-    public CustomCoreFeignClient(CoreClient coreClient, LoginService loginService) {
+    public CustomCoreFeignClient(SchedulerClient coreClient, LoginService loginService) {
         this.loginService = loginService;
         this.coreClient = coreClient;
     }

src/main/java/com/iexec/worker/feign/LoginService.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.
@@ -18,8 +18,8 @@
 
 import com.iexec.commons.poco.security.Signature;
 import com.iexec.commons.poco.utils.SignatureUtils;
+import com.iexec.core.api.SchedulerClient;
 import com.iexec.worker.chain.CredentialsService;
-import com.iexec.worker.feign.client.CoreClient;
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -37,10 +37,10 @@ public class LoginService {
     private String jwtToken;
 
     private final CredentialsService credentialsService;
-    private final CoreClient coreClient;
+    private final SchedulerClient coreClient;
     private final ReentrantLock lock = new ReentrantLock();
 
-    LoginService(CredentialsService credentialsService, CoreClient coreClient) {
+    LoginService(CredentialsService credentialsService, SchedulerClient coreClient) {
         this.credentialsService = credentialsService;
         this.coreClient = coreClient;
     }