Merge pull request #83 from iExecBlockchainComputing/feature/[email protected]@1.0.2

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

Author: jbern0rd

CHANGELOG.md

@@ -5,11 +5,13 @@ All notable changes to this project will be documented in this file.
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/vNEXT) 2023
 
 ### New Features
-* Enable Prometheus actuator. (#79)
+- Enable Prometheus actuator. (#79)
 ### Bug Fixes
-* Fix security rule to access Swagger API. (#79)
+- Fix security rule to access Swagger API. (#79)
 ### Dependency Upgrades
-* Upgrade to `feign` 11.10. (#80)
+- Upgrade to `feign` 11.10. (#80)
+- Upgrade to `iexec-common` 8.0.0. (#83)
+- Upgrade to `iexec-commons-poco` 1.0.2. (#83)
 
 ## [[8.0.1]](https://github.com/iExecBlockchainComputing/iexec-blockchain-adapter-api/releases/tag/v8.0.1) 2023-04-06
 

build.gradle

@@ -63,6 +63,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 
 	// iexec
+	implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
 	implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
 
 	// web3j bug required

gradle.properties

@@ -1,5 +1,6 @@
 version=8.0.1
-iexecCommonVersion=7.0.0
+iexecCommonVersion=8.0.0
+iexecCommonsPocoVersion=1.0.2
 
 nexusUser
 nexusPassword

iexec-blockchain-adapter-api-library/build.gradle

@@ -6,6 +6,7 @@ plugins {
 }
 
 dependencies {
+    implementation "com.iexec.commons:iexec-commons-poco:$iexecCommonsPocoVersion"
     implementation "com.iexec.common:iexec-common:$iexecCommonVersion"
     testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2'
 }

iexec-blockchain-adapter-api-library/src/main/java/com/iexec/blockchain/api/BlockchainAdapterApiClient.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 IEXEC BLOCKCHAIN TECH
+ * Copyright 2022-2023 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.
@@ -17,14 +17,14 @@
 package com.iexec.blockchain.api;
 
 import com.iexec.blockchain.tool.Status;
-import com.iexec.common.chain.ChainDataset;
-import com.iexec.common.chain.ChainTask;
 import com.iexec.common.chain.adapter.CommandStatus;
 import com.iexec.common.chain.adapter.args.TaskContributeArgs;
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.chain.adapter.args.TaskRevealArgs;
 import com.iexec.common.config.PublicChainConfig;
 import com.iexec.common.sdk.broker.BrokerOrder;
+import com.iexec.commons.poco.chain.ChainDataset;
+import com.iexec.commons.poco.chain.ChainTask;
 import feign.Param;
 import feign.RequestLine;
 

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

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.blockchain;
 
 import com.iexec.blockchain.api.BlockchainAdapterApiClient;
@@ -6,7 +22,6 @@
 import com.iexec.blockchain.signer.SignerService;
 import com.iexec.blockchain.tool.CredentialsService;
 import com.iexec.blockchain.tool.IexecHubService;
-import com.iexec.common.chain.*;
 import com.iexec.common.chain.adapter.args.TaskContributeArgs;
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.chain.adapter.args.TaskRevealArgs;
@@ -15,10 +30,11 @@
 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.security.Signature;
-import com.iexec.common.tee.TeeUtils;
-import com.iexec.common.utils.BytesUtils;
-import com.iexec.common.utils.HashUtils;
+import com.iexec.commons.poco.chain.*;
+import com.iexec.commons.poco.security.Signature;
+import com.iexec.commons.poco.tee.TeeUtils;
+import com.iexec.commons.poco.utils.BytesUtils;
+import com.iexec.commons.poco.utils.HashUtils;
 import feign.Logger;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -41,8 +57,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.IntStream;
 
-import static com.iexec.common.chain.ChainTaskStatus.ACTIVE;
-import static com.iexec.common.chain.ChainTaskStatus.UNSET;
+import static com.iexec.commons.poco.chain.ChainTaskStatus.ACTIVE;
+import static com.iexec.commons.poco.chain.ChainTaskStatus.UNSET;
 
 @Slf4j
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -207,7 +223,7 @@ private String buildRandomName(String baseName) {
     private AppOrder buildAppOrder(String appAddress, int volume) {
         return AppOrder.builder()
                 .app(appAddress)
-                .price(BigInteger.ZERO)
+                .appprice(BigInteger.ZERO)
                 .volume(BigInteger.valueOf(volume))
                 .tag(BytesUtils.EMPTY_HEX_STRING_32)
                 .datasetrestrict(BytesUtils.EMPTY_ADDRESS)
@@ -220,7 +236,7 @@ private AppOrder buildAppOrder(String appAddress, int volume) {
     private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volume) {
         return WorkerpoolOrder.builder()
                 .workerpool(workerpoolAddress)
-                .price(BigInteger.ZERO)
+                .workerpoolprice(BigInteger.ZERO)
                 .volume(BigInteger.valueOf(volume))
                 .tag(BytesUtils.EMPTY_HEX_STRING_32)
                 .trust(BigInteger.ZERO)
@@ -235,7 +251,7 @@ private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volum
     private DatasetOrder buildDatasetOrder(String datasetAddress, int volume) {
         return DatasetOrder.builder()
                 .dataset(datasetAddress)
-                .price(BigInteger.ZERO)
+                .datasetprice(BigInteger.ZERO)
                 .volume(BigInteger.valueOf(volume))
                 .tag(BytesUtils.EMPTY_HEX_STRING_32)
                 .apprestrict(BytesUtils.EMPTY_ADDRESS)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 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,15 +18,15 @@
 
 import com.iexec.blockchain.tool.ChainConfig;
 import com.iexec.blockchain.tool.IexecHubService;
-import com.iexec.common.chain.ChainAccount;
 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.BytesUtils;
 import com.iexec.common.utils.FeignBuilder;
+import com.iexec.commons.poco.chain.ChainAccount;
+import com.iexec.commons.poco.utils.BytesUtils;
 import feign.Logger;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;

src/main/java/com/iexec/blockchain/command/task/TaskController.java

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2021-2023 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.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 package com.iexec.blockchain.command.task;
 
 import com.iexec.blockchain.command.task.contribute.TaskContributeService;
@@ -6,10 +22,10 @@
 import com.iexec.blockchain.command.task.reveal.TaskRevealService;
 import com.iexec.blockchain.tool.IexecHubService;
 import com.iexec.blockchain.tool.Status;
-import com.iexec.common.chain.ChainTask;
 import com.iexec.common.chain.adapter.args.TaskContributeArgs;
 import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
 import com.iexec.common.chain.adapter.args.TaskRevealArgs;
+import com.iexec.commons.poco.chain.ChainTask;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import org.springframework.http.ResponseEntity;

src/main/java/com/iexec/blockchain/command/task/contribute/TaskContributeBlockchainService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 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.
@@ -20,8 +20,8 @@
 import com.iexec.blockchain.command.generic.CommandBlockchain;
 import com.iexec.blockchain.tool.CredentialsService;
 import com.iexec.blockchain.tool.IexecHubService;
-import com.iexec.common.chain.ChainTask;
-import com.iexec.common.chain.ChainTaskStatus;
+import com.iexec.commons.poco.chain.ChainTask;
+import com.iexec.commons.poco.chain.ChainTaskStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;

src/main/java/com/iexec/blockchain/command/task/finalize/TaskFinalizeBlockchainService.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2020 IEXEC BLOCKCHAIN TECH
+ * Copyright 2020-2023 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.
@@ -19,8 +19,8 @@
 
 import com.iexec.blockchain.command.generic.CommandBlockchain;
 import com.iexec.blockchain.tool.IexecHubService;
-import com.iexec.common.chain.ChainTask;
-import com.iexec.common.chain.ChainTaskStatus;
+import com.iexec.commons.poco.chain.ChainTask;
+import com.iexec.commons.poco.chain.ChainTaskStatus;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;