Merge pull request #551 from iExecBlockchainComputing/feature/bump-iexec-common-libraries

Feature/bump iexec common libraries

Author: jbern0rd

CHANGELOG.md

@@ -25,6 +25,9 @@ All notable changes to this project will be documented in this file.
 - Upgrade to Spring Boot 2.7.14. (#544)
 - Upgrade to Spring Dependency Management Plugin 1.1.3. (#544)
 - Upgrade to `jenkins-library` 2.7.3. (#549)
+- Upgrade to `iexec-commons-poco` 3.1.0. (#551)
+- Upgrade to `iexec-common` 8.3.0. (#551)
+- Upgrade to `iexec-commons-containers` 1.1.0. (#551)
 
 ## [[8.1.4]](https://github.com/iExecBlockchainComputing/iexec-worker/releases/tag/v8.1.4) 2023-06-27
 

gradle.properties

@@ -1,7 +1,7 @@
 version=8.1.4
-iexecCommonVersion=8.2.1-NEXT-SNAPSHOT
-iexecCommonsContainersVersion=1.0.3
-iexecCommonsPocoVersion=3.0.5
+iexecCommonVersion=8.3.0
+iexecCommonsContainersVersion=1.1.0
+iexecCommonsPocoVersion=3.1.0
 iexecBlockchainAdapterVersion=8.1.1
 iexecResultVersion=8.1.1
 iexecSmsVersion=8.1.1

src/main/java/com/iexec/worker/compute/app/AppComputeService.java

@@ -17,11 +17,11 @@
 package com.iexec.worker.compute.app;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.IexecEnvUtils;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.sms.api.TeeSessionGenerationResponse;
 import com.iexec.worker.config.WorkerConfigurationService;

src/main/java/com/iexec/worker/sgx/SgxService.java

@@ -17,11 +17,11 @@
 package com.iexec.worker.sgx;
 
 import com.github.dockerjava.api.model.Device;
-import com.iexec.common.sgx.SgxDriverMode;
-import com.iexec.common.utils.SgxUtils;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
+import com.iexec.commons.containers.SgxUtils;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.docker.DockerService;
 import lombok.extern.slf4j.Slf4j;
@@ -51,7 +51,7 @@ public SgxService(
             WorkerConfigurationService workerConfigService,
             ApplicationContext context,
             DockerService dockerService,
-            @Value("${tee.sgx.driver-mode}") SgxDriverMode sgxDriverMode
+            @Value("${tee.sgx.driver-mode:NONE}") SgxDriverMode sgxDriverMode
     ) {
         this.workerConfigService = workerConfigService;
         this.context = context;

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

@@ -27,7 +27,6 @@
 import org.junit.jupiter.params.provider.EnumSource;
 import org.mockito.Mock;
 import org.mockito.MockedStatic;
-import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.web3j.crypto.Credentials;
@@ -37,10 +36,8 @@
 import org.web3j.protocol.core.RemoteFunctionCall;
 import org.web3j.protocol.core.methods.response.Log;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
-import org.web3j.tx.TransactionManager;
 import org.web3j.utils.Numeric;
 
-import java.math.BigInteger;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
@@ -79,21 +76,13 @@ class IexecHubServiceTests {
     @BeforeEach
     void init() throws Exception {
         MockitoAnnotations.openMocks(this);
-        when(blockchainAdapterConfigurationService.getIexecHubContractAddress()).thenReturn("hub");
+        when(blockchainAdapterConfigurationService.getIexecHubContractAddress()).thenReturn("0x748e091bf16048cb5103E0E10F9D5a8b7fBDd860");
         when(blockchainAdapterConfigurationService.getBlockTime()).thenReturn(Duration.ofSeconds(5L));
         when(blockchainAdapterConfigurationService.getChainId()).thenReturn(65535);
         credentials = Credentials.create(Keys.createEcKeyPair());
         when(credentialsService.getCredentials()).thenReturn(credentials);
         when(web3jService.getWeb3j()).thenReturn(web3jClient);
-        try (MockedStatic<IexecHubContract> iexecHubContract = Mockito.mockStatic(IexecHubContract.class)) {
-            final IexecHubContract mockIexecContract = mock(IexecHubContract.class);
-            final RemoteFunctionCall<BigInteger> mockRemoteFunctionCall = mock(RemoteFunctionCall.class);
-            iexecHubContract.when(() -> IexecHubContract.load(any(), any(), (TransactionManager) any(), any()))
-                    .thenReturn(mockIexecContract);
-            when(mockIexecContract.contribution_deadline_ratio()).thenReturn(mockRemoteFunctionCall);
-            when(mockRemoteFunctionCall.send()).thenReturn(BigInteger.ONE);
-            iexecHubService = spy(new IexecHubService(credentialsService, web3jService, blockchainAdapterConfigurationService));
-        }
+        iexecHubService = spy(new IexecHubService(credentialsService, web3jService, blockchainAdapterConfigurationService));
         ReflectionTestUtils.setField(iexecHubService, "iexecHubContract", iexecHubContract);
     }
 
@@ -205,7 +194,7 @@ void shouldNotContributeRevealWhenInterrupted() throws ExecutionException, Inter
             assertThat(Thread.currentThread().isInterrupted()).isTrue();
         }
     }
-    // end region
+    // endregion
 
     // region contributeAndFinalize
     @Test

src/test/java/com/iexec/worker/compute/app/AppComputeServiceTests.java

@@ -16,12 +16,12 @@
 
 package com.iexec.worker.compute.app;
 
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.IexecEnvUtils;
 import com.iexec.common.utils.IexecFileHelper;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.commons.poco.tee.TeeEnclaveConfiguration;
 import com.iexec.sms.api.TeeSessionGenerationResponse;

src/test/java/com/iexec/worker/compute/post/PostComputeServiceTests.java

@@ -17,12 +17,12 @@
 package com.iexec.worker.compute.post;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.common.utils.FileHelper;
 import com.iexec.common.utils.IexecFileHelper;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.sms.api.TeeSessionGenerationResponse;

src/test/java/com/iexec/worker/compute/pre/PreComputeServiceTests.java

@@ -17,10 +17,10 @@
 package com.iexec.worker.compute.pre;
 
 import com.iexec.common.replicate.ReplicateStatusCause;
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
 import com.iexec.commons.poco.task.TaskDescription;

src/test/java/com/iexec/worker/tee/scone/LasServiceTests.java

@@ -1,9 +1,9 @@
 package com.iexec.worker.tee.scone;
 
-import com.iexec.common.sgx.SgxDriverMode;
 import com.iexec.commons.containers.DockerRunFinalStatus;
 import com.iexec.commons.containers.DockerRunRequest;
 import com.iexec.commons.containers.DockerRunResponse;
+import com.iexec.commons.containers.SgxDriverMode;
 import com.iexec.commons.containers.client.DockerClientInstance;
 import com.iexec.worker.config.WorkerConfigurationService;
 import com.iexec.worker.docker.DockerService;
@@ -25,8 +25,8 @@ class LasServiceTests {
     private static final String CONTAINER_NAME = "iexec-las";
     private static final String REGISTRY_NAME = "registryName";
     private static final String IMAGE_URI = REGISTRY_NAME +"/some/image/name:x.y";
-    public static final String REGISTRY_USERNAME = "registryUsername";
-    public static final String REGISTRY_PASSWORD = "registryPassword";
+    private static final String REGISTRY_USERNAME = "registryUsername";
+    private static final String REGISTRY_PASSWORD = "registryPassword";
 
     @Captor
     ArgumentCaptor<DockerRunRequest> dockerRunRequestArgumentCaptor;
@@ -62,6 +62,7 @@ void init() throws Exception {
         when(dockerService.getClient()).thenReturn(dockerClientInstanceMock);
         when(dockerService.getClient(REGISTRY_NAME, REGISTRY_USERNAME, REGISTRY_PASSWORD))
                 .thenReturn(dockerClientInstanceMock);
+        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.NATIVE);
     }
 
     // region start
@@ -70,7 +71,6 @@ void shouldStartLasService() {
         when(dockerClientInstanceMock.pullImage(IMAGE_URI)).thenReturn(true);
         when(dockerService.run(any()))
                 .thenReturn(DockerRunResponse.builder().finalStatus(DockerRunFinalStatus.SUCCESS).build());
-        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.LEGACY);
 
         assertTrue(lasService.start());
         verify(dockerService).run(dockerRunRequestArgumentCaptor.capture());
@@ -79,7 +79,7 @@ void shouldStartLasService() {
                 DockerRunRequest.builder()
                         .containerName(CONTAINER_NAME)
                         .imageUri(IMAGE_URI)
-                        .sgxDriverMode(SgxDriverMode.LEGACY)
+                        .sgxDriverMode(SgxDriverMode.NATIVE)
                         .maxExecutionTime(0)
                         .build()
         );
@@ -91,7 +91,6 @@ void shouldStartLasServiceOnlyOnce() throws Exception {
         when(dockerClientInstanceMock.pullImage(IMAGE_URI)).thenReturn(true);
         when(dockerService.run(any()))
                 .thenReturn(DockerRunResponse.builder().finalStatus(DockerRunFinalStatus.SUCCESS).build());
-        when(sgxService.getSgxDriverMode()).thenReturn(SgxDriverMode.LEGACY);
 
         assertTrue(lasService.start());
         assertTrue(lasService.start());