Skip to content

Commit e11ff44

Browse files
jbern0rdjbern0rd
committed
Update classes
1 parent ca1aea4 commit e11ff44

File tree

20 files changed

+175
-64
lines changed

20 files changed

+175
-64
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2022-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -17,14 +17,14 @@
1717
package com.iexec.blockchain.api;
1818

1919
import com.iexec.blockchain.tool.Status;
20-
import com.iexec.common.chain.ChainDataset;
21-
import com.iexec.common.chain.ChainTask;
2220
import com.iexec.common.chain.adapter.CommandStatus;
2321
import com.iexec.common.chain.adapter.args.TaskContributeArgs;
2422
import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
2523
import com.iexec.common.chain.adapter.args.TaskRevealArgs;
2624
import com.iexec.common.config.PublicChainConfig;
2725
import com.iexec.common.sdk.broker.BrokerOrder;
26+
import com.iexec.commons.poco.chain.ChainDataset;
27+
import com.iexec.commons.poco.chain.ChainTask;
2828
import feign.Param;
2929
import feign.RequestLine;
3030

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

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.iexec.blockchain;
218

319
import com.iexec.blockchain.api.BlockchainAdapterApiClient;
@@ -6,7 +22,6 @@
622
import com.iexec.blockchain.signer.SignerService;
723
import com.iexec.blockchain.tool.CredentialsService;
824
import com.iexec.blockchain.tool.IexecHubService;
9-
import com.iexec.common.chain.*;
1025
import com.iexec.common.chain.adapter.args.TaskContributeArgs;
1126
import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
1227
import com.iexec.common.chain.adapter.args.TaskRevealArgs;
@@ -15,10 +30,11 @@
1530
import com.iexec.common.sdk.order.payload.DatasetOrder;
1631
import com.iexec.common.sdk.order.payload.RequestOrder;
1732
import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
18-
import com.iexec.common.security.Signature;
19-
import com.iexec.common.tee.TeeUtils;
20-
import com.iexec.common.utils.BytesUtils;
21-
import com.iexec.common.utils.HashUtils;
33+
import com.iexec.commons.poco.chain.*;
34+
import com.iexec.commons.poco.security.Signature;
35+
import com.iexec.commons.poco.tee.TeeUtils;
36+
import com.iexec.commons.poco.utils.BytesUtils;
37+
import com.iexec.commons.poco.utils.HashUtils;
2238
import feign.Logger;
2339
import lombok.extern.slf4j.Slf4j;
2440
import org.apache.commons.lang3.RandomStringUtils;
@@ -41,8 +57,8 @@
4157
import java.util.concurrent.TimeUnit;
4258
import java.util.stream.IntStream;
4359

44-
import static com.iexec.common.chain.ChainTaskStatus.ACTIVE;
45-
import static com.iexec.common.chain.ChainTaskStatus.UNSET;
60+
import static com.iexec.commons.poco.chain.ChainTaskStatus.ACTIVE;
61+
import static com.iexec.commons.poco.chain.ChainTaskStatus.UNSET;
4662

4763
@Slf4j
4864
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -207,7 +223,7 @@ private String buildRandomName(String baseName) {
207223
private AppOrder buildAppOrder(String appAddress, int volume) {
208224
return AppOrder.builder()
209225
.app(appAddress)
210-
.price(BigInteger.ZERO)
226+
.appprice(BigInteger.ZERO)
211227
.volume(BigInteger.valueOf(volume))
212228
.tag(BytesUtils.EMPTY_HEX_STRING_32)
213229
.datasetrestrict(BytesUtils.EMPTY_ADDRESS)
@@ -220,7 +236,7 @@ private AppOrder buildAppOrder(String appAddress, int volume) {
220236
private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volume) {
221237
return WorkerpoolOrder.builder()
222238
.workerpool(workerpoolAddress)
223-
.price(BigInteger.ZERO)
239+
.workerpoolprice(BigInteger.ZERO)
224240
.volume(BigInteger.valueOf(volume))
225241
.tag(BytesUtils.EMPTY_HEX_STRING_32)
226242
.trust(BigInteger.ZERO)
@@ -235,7 +251,7 @@ private WorkerpoolOrder buildWorkerpoolOrder(String workerpoolAddress, int volum
235251
private DatasetOrder buildDatasetOrder(String datasetAddress, int volume) {
236252
return DatasetOrder.builder()
237253
.dataset(datasetAddress)
238-
.price(BigInteger.ZERO)
254+
.datasetprice(BigInteger.ZERO)
239255
.volume(BigInteger.valueOf(volume))
240256
.tag(BytesUtils.EMPTY_HEX_STRING_32)
241257
.apprestrict(BytesUtils.EMPTY_ADDRESS)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -18,15 +18,15 @@
1818

1919
import com.iexec.blockchain.tool.ChainConfig;
2020
import com.iexec.blockchain.tool.IexecHubService;
21-
import com.iexec.common.chain.ChainAccount;
2221
import com.iexec.common.sdk.broker.BrokerOrder;
2322
import com.iexec.common.sdk.cli.FillOrdersCliOutput;
2423
import com.iexec.common.sdk.order.payload.AppOrder;
2524
import com.iexec.common.sdk.order.payload.DatasetOrder;
2625
import com.iexec.common.sdk.order.payload.RequestOrder;
2726
import com.iexec.common.sdk.order.payload.WorkerpoolOrder;
28-
import com.iexec.common.utils.BytesUtils;
2927
import com.iexec.common.utils.FeignBuilder;
28+
import com.iexec.commons.poco.chain.ChainAccount;
29+
import com.iexec.commons.poco.utils.BytesUtils;
3030
import feign.Logger;
3131
import lombok.extern.slf4j.Slf4j;
3232
import org.apache.commons.lang3.StringUtils;

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.iexec.blockchain.command.task;
218

319
import com.iexec.blockchain.command.task.contribute.TaskContributeService;
@@ -6,10 +22,10 @@
622
import com.iexec.blockchain.command.task.reveal.TaskRevealService;
723
import com.iexec.blockchain.tool.IexecHubService;
824
import com.iexec.blockchain.tool.Status;
9-
import com.iexec.common.chain.ChainTask;
1025
import com.iexec.common.chain.adapter.args.TaskContributeArgs;
1126
import com.iexec.common.chain.adapter.args.TaskFinalizeArgs;
1227
import com.iexec.common.chain.adapter.args.TaskRevealArgs;
28+
import com.iexec.commons.poco.chain.ChainTask;
1329
import io.swagger.v3.oas.annotations.Operation;
1430
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
1531
import org.springframework.http.ResponseEntity;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,8 +20,8 @@
2020
import com.iexec.blockchain.command.generic.CommandBlockchain;
2121
import com.iexec.blockchain.tool.CredentialsService;
2222
import com.iexec.blockchain.tool.IexecHubService;
23-
import com.iexec.common.chain.ChainTask;
24-
import com.iexec.common.chain.ChainTaskStatus;
23+
import com.iexec.commons.poco.chain.ChainTask;
24+
import com.iexec.commons.poco.chain.ChainTaskStatus;
2525
import lombok.extern.slf4j.Slf4j;
2626
import org.springframework.stereotype.Service;
2727
import org.web3j.protocol.core.methods.response.TransactionReceipt;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
1919

2020
import com.iexec.blockchain.command.generic.CommandBlockchain;
2121
import com.iexec.blockchain.tool.IexecHubService;
22-
import com.iexec.common.chain.ChainTask;
23-
import com.iexec.common.chain.ChainTaskStatus;
22+
import com.iexec.commons.poco.chain.ChainTask;
23+
import com.iexec.commons.poco.chain.ChainTaskStatus;
2424
import lombok.extern.slf4j.Slf4j;
2525
import org.springframework.stereotype.Service;
2626
import org.web3j.protocol.core.methods.response.TransactionReceipt;

‎src/main/java/com/iexec/blockchain/command/task/initialize/TaskInitializeService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
1919

2020
import com.iexec.blockchain.command.generic.CommandEngine;
2121
import com.iexec.blockchain.tool.QueueService;
22-
import com.iexec.common.chain.ChainUtils;
22+
import com.iexec.commons.poco.chain.ChainUtils;
2323
import org.springframework.stereotype.Service;
2424

2525
import static com.iexec.blockchain.tool.IexecHubService.isByte32;

‎src/main/java/com/iexec/blockchain/command/task/reveal/TaskRevealBlockchainService.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2020 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2020-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,11 +20,11 @@
2020
import com.iexec.blockchain.command.generic.CommandBlockchain;
2121
import com.iexec.blockchain.tool.CredentialsService;
2222
import com.iexec.blockchain.tool.IexecHubService;
23-
import com.iexec.common.chain.ChainContribution;
24-
import com.iexec.common.chain.ChainContributionStatus;
25-
import com.iexec.common.chain.ChainTask;
26-
import com.iexec.common.chain.ChainTaskStatus;
2723
import com.iexec.common.worker.result.ResultUtils;
24+
import com.iexec.commons.poco.chain.ChainContribution;
25+
import com.iexec.commons.poco.chain.ChainContributionStatus;
26+
import com.iexec.commons.poco.chain.ChainTask;
27+
import com.iexec.commons.poco.chain.ChainTaskStatus;
2828
import lombok.extern.slf4j.Slf4j;
2929
import org.springframework.stereotype.Service;
3030
import org.web3j.protocol.core.methods.response.TransactionReceipt;

‎src/main/java/com/iexec/blockchain/config/PublicConfigurationController.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2021 IEXEC BLOCKCHAIN TECH
2+
* Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ public ResponseEntity<PublicChainConfig> getPublicChainConfig() {
4343
final PublicChainConfig publicChainConfig = PublicChainConfig
4444
.builder()
4545
.chainId(chainConfig.getChainId())
46-
.isSidechain(chainConfig.isSidechain())
46+
.sidechain(chainConfig.isSidechain())
4747
.chainNodeUrl(chainConfig.getNodeAddress())
4848
.iexecHubContractAddress(chainConfig.getHubAddress())
4949
.blockTime(Duration.ofSeconds(blockTime))

‎src/main/java/com/iexec/blockchain/dataset/DatasetController.java‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
/*
2+
* Copyright 2021-2023 IEXEC BLOCKCHAIN TECH
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.iexec.blockchain.dataset;
218

319
import com.iexec.blockchain.tool.Status;
4-
import com.iexec.common.chain.ChainDataset;
20+
import com.iexec.commons.poco.chain.ChainDataset;
521
import io.swagger.v3.oas.annotations.Operation;
622
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
723
import org.springframework.http.ResponseEntity;

0 commit comments

Comments
 (0)