Merge branch 'develop' into feature/refactor-to-avoid-unnecessary-db-…

…calls
iExecBlockchainComputing · May 17, 2023 · 50f887f · 50f887f
2 parents 3760cb3 + b8b7689
commit 50f887f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,8 +19,8 @@ All notable changes to this project will be documented in this file.
 - Use `==` or `!=` operators to test the equality of enums. (#584)
 - Rearrange checks order to avoid call to database. (#585)
 ### Dependency Upgrades
-- Upgrade to `iexec-common` 8.0.0-NEXT-SNAPSHOT. (#571 #575)
-- Add new `iexec-commons-poco` 1.0.2-NEXT-SNAPSHOT dependency. (#571 #574)
+- Upgrade to `iexec-common` 8.1.0-NEXT-SNAPSHOT. (#571 #575 #586)
+- Add new `iexec-commons-poco` 2.0.0 dependency. (#571 #574 #586)
 
 ## [[8.0.1]](https://github.com/iExecBlockchainComputing/iexec-core/releases/tag/v8.0.1) 2023-03-20
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 version=8.0.1
-iexecCommonVersion=8.0.0-NEXT-SNAPSHOT
-iexecCommonsPocoVersion=1.0.2-NEXT-SNAPSHOT
+iexecCommonVersion=8.1.0-NEXT-SNAPSHOT
+iexecCommonsPocoVersion=2.0.0
 iexecBlockchainAdapterVersion=8.0.1-NEXT-SNAPSHOT
 iexecResultVersion=8.0.0-NEXT-SNAPSHOT
 iexecSmsVersion=8.0.0-NEXT-SNAPSHOT

diff --git a/src/main/java/com/iexec/core/result/ResultService.java b/src/main/java/com/iexec/core/result/ResultService.java
@@ -16,8 +16,8 @@
 
 package com.iexec.core.result;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.core.chain.ChainConfig;
 import com.iexec.core.chain.CredentialsService;
 import com.iexec.resultproxy.api.ResultProxyClient;

diff --git a/src/main/java/com/iexec/core/security/EIP712ChallengeService.java b/src/main/java/com/iexec/core/security/EIP712ChallengeService.java
@@ -16,9 +16,9 @@
 
 package com.iexec.core.security;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.Challenge;
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.Challenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import net.jodah.expiringmap.ExpirationPolicy;
 import net.jodah.expiringmap.ExpiringMap;
 import org.springframework.stereotype.Service;

diff --git a/src/main/java/com/iexec/core/task/TaskController.java b/src/main/java/com/iexec/core/task/TaskController.java
@@ -16,9 +16,9 @@
 
 package com.iexec.core.task;
 
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.replicate.ComputeLogs;
 import com.iexec.common.security.SignedChallenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.commons.poco.security.Signature;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.commons.poco.utils.SignatureUtils;

diff --git a/src/test/java/com/iexec/core/security/EIP712ChallengeServiceTests.java b/src/test/java/com/iexec/core/security/EIP712ChallengeServiceTests.java
@@ -16,7 +16,7 @@
 
 package com.iexec.core.security;
 
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.web3j.crypto.Keys;

diff --git a/src/test/java/com/iexec/core/task/TaskControllerTests.java b/src/test/java/com/iexec/core/task/TaskControllerTests.java
@@ -16,10 +16,10 @@
 
 package com.iexec.core.task;
 
-import com.iexec.common.chain.eip712.EIP712Domain;
-import com.iexec.common.chain.eip712.entity.Challenge;
-import com.iexec.common.chain.eip712.entity.EIP712Challenge;
 import com.iexec.common.replicate.ComputeLogs;
+import com.iexec.commons.poco.eip712.EIP712Domain;
+import com.iexec.commons.poco.eip712.entity.Challenge;
+import com.iexec.commons.poco.eip712.entity.EIP712Challenge;
 import com.iexec.commons.poco.task.TaskDescription;
 import com.iexec.core.chain.IexecHubService;
 import com.iexec.core.logs.TaskLogs;