Merge pull request #85 from iExecBlockchainComputing/feature/[email protected]@8.1.0-NEXT-SNAPSHOT

Feature/iexec commons [email protected] iexec [email protected] next snapshot

Author: jbern0rd

CHANGELOG.md

@@ -11,8 +11,8 @@ All notable changes to this project will be documented in this file.
 - Fix security rule to access Swagger API. (#79)
 ### Dependency Upgrades
 - Upgrade to `feign` 11.10. (#80)
-- Upgrade to `iexec-common` 8.0.0. (#83)
-- Upgrade to `iexec-commons-poco` 1.0.2. (#83)
+- Upgrade to `iexec-common` 8.1.0-NEXT-SNAPSHOT. (#83 #85)
+- Upgrade to `iexec-commons-poco` 2.0.0. (#83 #85)
 
 ## [[8.0.1]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.0.1) 2023-04-06
 

gradle.properties

@@ -1,6 +1,6 @@
 version=8.0.1
-iexecCommonVersion=8.0.0
-iexecCommonsPocoVersion=1.0.2
+iexecCommonVersion=8.1.0-NEXT-SNAPSHOT
+iexecCommonsPocoVersion=2.0.0
 
 nexusUser
 nexusPassword

src/itest/java/com/iexec/blockchain/IntegrationTests.java

@@ -26,11 +26,11 @@
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.chain.adapter.args.TaskRevealArgs;
 import com.iexec.common.sdk.broker.BrokerOrder;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
 import com.iexec.commons.poco.chain.*;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import com.iexec.commons.poco.security.Signature;
 import com.iexec.commons.poco.tee.TeeUtils;
 import com.iexec.commons.poco.utils.BytesUtils;
@@ -159,7 +159,7 @@ public void shouldBurstTransactionsWithAverageOfOneTxPerBlock(){
                             //no need to wait for propagation update in db
                             Assertions.assertTrue(true);
                         } catch (Exception e) {
-                            e.printStackTrace();
+                            log.error("Watcher failed with an exception", e);
                             Assertions.fail();
                         }
                     }));
@@ -339,20 +339,19 @@ private void waitBeforeFinalizing(String chainTaskId) throws Exception {
                 throw new Exception("Too long to wait for reveal: " + chainTaskId);
             }
         }
-        System.out.println("All revealed (" + revealCounter + "/" + winnerCounter + ")");
+        log.info("All revealed ({}/{})", revealCounter, winnerCounter);
     }
 
     public WorkerpoolAuthorization mockAuthorization(String chainTaskId,
                                                      String enclaveChallenge) {
         String workerWallet = credentialsService.getCredentials().getAddress();
-        String hash =
-                HashUtils.concatenateAndHash(workerWallet,
-                        chainTaskId,
-                        enclaveChallenge);
-
-        Sign.SignatureData sign =
-                Sign.signPrefixedMessage(BytesUtils.stringToBytes(hash),
-                        credentialsService.getCredentials().getEcKeyPair());
+        String hash = HashUtils.concatenateAndHash(
+                workerWallet,
+                chainTaskId,
+                enclaveChallenge);
+
+        Sign.SignatureData sign = Sign.signPrefixedMessage(BytesUtils.stringToBytes(hash),
+                credentialsService.getCredentials().getEcKeyPair());
 
         return WorkerpoolAuthorization.builder()
                 .workerWallet(workerWallet)

src/main/java/com/iexec/blockchain/broker/BrokerService.java

@@ -20,12 +20,12 @@
 import com.iexec.blockchain.tool.IexecHubService;
 import com.iexec.common.sdk.broker.BrokerOrder;
 import com.iexec.common.sdk.cli.FillOrdersCliOutput;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
 import com.iexec.common.utils.FeignBuilder;
 import com.iexec.commons.poco.chain.ChainAccount;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
 import feign.Logger;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/iexec/blockchain/signer/SignerService.java

@@ -18,11 +18,11 @@
 
 import com.iexec.blockchain.tool.ChainConfig;
 import com.iexec.blockchain.tool.CredentialsService;
-import com.iexec.common.sdk.order.OrderSigner;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
+import com.iexec.commons.poco.eip712.OrderSigner;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import org.springframework.stereotype.Service;
 
 @Service

src/test/java/com/iexec/blockchain/broker/BrokerServiceTests.java

@@ -19,11 +19,11 @@
 import com.iexec.blockchain.tool.ChainConfig;
 import com.iexec.blockchain.tool.IexecHubService;
 import com.iexec.common.sdk.broker.BrokerOrder;
-import com.iexec.common.sdk.order.payload.AppOrder;
-import com.iexec.common.sdk.order.payload.DatasetOrder;
-import com.iexec.common.sdk.order.payload.RequestOrder;
-import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
 import com.iexec.commons.poco.chain.ChainAccount;
+import com.iexec.commons.poco.order.AppOrder;
+import com.iexec.commons.poco.order.DatasetOrder;
+import com.iexec.commons.poco.order.RequestOrder;
+import com.iexec.commons.poco.order.WorkerpoolOrder;
 import com.iexec.commons.poco.utils.BytesUtils;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;