Skip to content

Commit 7ece6ee

Browse files
nabil-Tounartinabil-Tounarti
authored
Resolve deprecations in ReplicatesService and ResultService caused by TaskDescription (#723)
1 parent f469153 commit 7ece6ee

File tree

5 files changed

+46
-25
lines changed

5 files changed

+46
-25
lines changed

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file.
2121
- Reorder static and final keywords. (#717)
2222
- Update `contribution` and `contributionAndFinalize` detector tests.
2323
TEE tasks with callback are now eligible to `contributeAndFinalize` flow. (#719)
24+
- Resolve deprecations caused by `TaskDescription` in `ReplicatesService` and `ResultService`. (#723)
2425

2526
### Dependency Upgrades
2627

‎src/main/java/com/iexec/core/replicate/ReplicatesService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ public boolean isResultUploaded(String chainTaskId) {
545545
return isResultUploaded(task);
546546
}
547547

548-
public boolean isResultUploaded(TaskDescription task) {
549-
final boolean hasIpfsStorageProvider = IPFS_RESULT_STORAGE_PROVIDER.equals(task.getResultStorageProvider());
548+
public boolean isResultUploaded(final TaskDescription task) {
549+
final boolean hasIpfsStorageProvider = IPFS_RESULT_STORAGE_PROVIDER.equals(task.getDealParams().getIexecResultStorageProvider());
550550

551551
// Offchain computing or TEE task with private storage
552552
if (task.containsCallback() || (task.isTeeTask() && !hasIpfsStorageProvider)) {

‎src/main/java/com/iexec/core/result/ResultService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public ResultService(final ResultRepositoryConfiguration resultRepositoryConfigu
4848
@Retryable(value = FeignException.class)
4949
public boolean isResultUploaded(final TaskDescription taskDescription) {
5050
final String chainTaskId = taskDescription.getChainTaskId();
51-
final ResultProxyClient resultProxyClient = resultRepositoryConfiguration.createResultProxyClientFromURL(taskDescription.getResultStorageProxy());
51+
final ResultProxyClient resultProxyClient = resultRepositoryConfiguration.createResultProxyClientFromURL(taskDescription.getDealParams().getIexecResultStorageProxy());
5252
final String enclaveChallenge = taskService.getTaskByChainTaskId(chainTaskId).map(Task::getEnclaveChallenge).orElse(EMPTY_ADDRESS);
5353
final WorkerpoolAuthorization workerpoolAuthorization = signatureService.createAuthorization(signatureService.getAddress(), chainTaskId, enclaveChallenge);
5454
final String resultProxyToken = resultProxyClient.getJwt(workerpoolAuthorization.getSignature().getValue(), workerpoolAuthorization);

‎src/test/java/com/iexec/core/replicate/ReplicateServiceTests.java‎

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import com.iexec.common.replicate.*;
2020
import com.iexec.commons.poco.chain.ChainContribution;
2121
import com.iexec.commons.poco.chain.ChainTask;
22+
import com.iexec.commons.poco.chain.DealParams;
2223
import com.iexec.commons.poco.task.TaskDescription;
2324
import com.iexec.commons.poco.utils.BytesUtils;
2425
import com.iexec.core.chain.IexecHubService;
@@ -749,36 +750,42 @@ void shouldGetReplicateWithResultUploadedStatus() {
749750

750751
@ParameterizedTest
751752
@ValueSource(booleans = {true, false})
752-
void shouldCheckResultServiceAndReturnTrue(boolean isTeeTask) {
753+
void shouldCheckResultServiceAndReturnTrue(final boolean isTeeTask) {
754+
final DealParams dealParams = DealParams.builder()
755+
.iexecResultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
756+
.build();
753757
TaskDescription taskDescription = TaskDescription.builder()
754758
.chainTaskId(CHAIN_TASK_ID)
755759
.callback(BytesUtils.EMPTY_ADDRESS)
756760
.isTeeTask(isTeeTask)
757-
.resultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
761+
.dealParams(dealParams)
758762
.build();
759763
when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
760764
.thenReturn(taskDescription);
761765
when(resultService.isResultUploaded(taskDescription)).thenReturn(true);
762766

763-
boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
767+
final boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
764768
assertThat(isResultUploaded).isTrue();
765769
verify(resultService).isResultUploaded(taskDescription);
766770
}
767771

768772
@ParameterizedTest
769773
@ValueSource(booleans = {true, false})
770-
void shouldCheckResultServiceAndReturnFalse(boolean isTeeTask) {
771-
TaskDescription taskDescription = TaskDescription.builder()
774+
void shouldCheckResultServiceAndReturnFalse(final boolean isTeeTask) {
775+
final DealParams dealParams = DealParams.builder()
776+
.iexecResultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
777+
.build();
778+
final TaskDescription taskDescription = TaskDescription.builder()
772779
.chainTaskId(CHAIN_TASK_ID)
773780
.callback(BytesUtils.EMPTY_ADDRESS)
774781
.isTeeTask(isTeeTask)
775-
.resultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
782+
.dealParams(dealParams)
776783
.build();
777784
when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
778785
.thenReturn(taskDescription);
779786
when(resultService.isResultUploaded(taskDescription)).thenReturn(false);
780787

781-
boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
788+
final boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
782789
assertThat(isResultUploaded).isFalse();
783790
verify(resultService).isResultUploaded(taskDescription);
784791
}
@@ -811,16 +818,19 @@ void shouldReturnTrueForCallbackTask(boolean isTeeTask) {
811818

812819
@Test
813820
void shouldReturnTrueIfPrivateStorageForTeeTask() {
814-
TaskDescription taskDescription = TaskDescription.builder()
821+
final DealParams dealParams = DealParams.builder()
822+
.iexecResultStorageProvider(DROPBOX_RESULT_STORAGE_PROVIDER)
823+
.build();
824+
final TaskDescription taskDescription = TaskDescription.builder()
815825
.chainTaskId(CHAIN_TASK_ID)
816826
.callback(BytesUtils.EMPTY_ADDRESS)
817827
.isTeeTask(true)
818-
.resultStorageProvider(DROPBOX_RESULT_STORAGE_PROVIDER)
828+
.dealParams(dealParams)
819829
.build();
820830
when(iexecHubService.getTaskDescription(CHAIN_TASK_ID))
821831
.thenReturn(taskDescription);
822832

823-
boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
833+
final boolean isResultUploaded = replicatesService.isResultUploaded(CHAIN_TASK_ID);
824834
assertThat(isResultUploaded).isTrue();
825835
verify(resultService, never()).isResultUploaded(any());
826836
}
@@ -912,10 +922,10 @@ void shouldNotAuthorizeUpdateSinceBadWorkflowTransition() {
912922

913923
@Test
914924
void shouldNotAuthorizeUpdateSinceContributeFailed() {
915-
Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
925+
final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
916926
replicate.updateStatus(CONTRIBUTING, ReplicateStatusModifier.WORKER);
917927

918-
ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
928+
final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
919929
.modifier(WORKER)
920930
.status(CONTRIBUTE_FAILED)
921931
.build();
@@ -926,10 +936,10 @@ void shouldNotAuthorizeUpdateSinceContributeFailed() {
926936

927937
@Test
928938
void shouldNotAuthorizeUpdateSinceRevealFailed() {
929-
Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
939+
final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
930940
replicate.updateStatus(REVEALING, ReplicateStatusModifier.WORKER);
931941

932-
ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
942+
final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
933943
.modifier(WORKER)
934944
.status(REVEAL_FAILED)
935945
.build();
@@ -940,16 +950,19 @@ void shouldNotAuthorizeUpdateSinceRevealFailed() {
940950

941951
@Test
942952
void shouldAuthorizeUpdateOnResultUploadFailed() {
943-
Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
953+
final DealParams dealParams = DealParams.builder()
954+
.iexecResultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
955+
.build();
956+
final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
944957
replicate.updateStatus(RESULT_UPLOADING, ReplicateStatusModifier.WORKER);
945958

946-
ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
959+
final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
947960
.modifier(WORKER)
948961
.status(RESULT_UPLOAD_FAILED)
949962
.build();
950-
UpdateReplicateStatusArgs updateReplicateStatusArgs = UpdateReplicateStatusArgs
963+
final UpdateReplicateStatusArgs updateReplicateStatusArgs = UpdateReplicateStatusArgs
951964
.builder()
952-
.taskDescription(TaskDescription.builder().resultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER).build())
965+
.taskDescription(TaskDescription.builder().dealParams(dealParams).build())
953966
.build();
954967

955968
assertThat(replicatesService.canUpdateReplicateStatus(replicate, statusUpdate, updateReplicateStatusArgs))
@@ -958,10 +971,10 @@ void shouldAuthorizeUpdateOnResultUploadFailed() {
958971

959972
@Test
960973
void shouldNotAuthorizeUpdateOnResultUploadFailedSinceResultUploadedWithCallback() {
961-
Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
974+
final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
962975
replicate.updateStatus(RESULT_UPLOADING, ReplicateStatusModifier.WORKER);
963976

964-
ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
977+
final ReplicateStatusUpdate statusUpdate = ReplicateStatusUpdate.builder()
965978
.modifier(WORKER)
966979
.status(RESULT_UPLOAD_FAILED)
967980
.build();
@@ -1188,6 +1201,9 @@ void shouldNotAuthorizeUpdateOnContributeAndFinalizeDoneWhenNotRevealed() {
11881201

11891202
@Test
11901203
void shouldNotAuthorizeUpdateOnContributeAndFinalizeDoneWhenNotUploaded() {
1204+
final DealParams dealParams = DealParams.builder()
1205+
.iexecResultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
1206+
.build();
11911207
final Replicate replicate = new Replicate(WALLET_WORKER_1, CHAIN_TASK_ID);
11921208
replicate.updateStatus(CONTRIBUTE_AND_FINALIZE_ONGOING, ReplicateStatusModifier.WORKER);
11931209

@@ -1198,7 +1214,7 @@ void shouldNotAuthorizeUpdateOnContributeAndFinalizeDoneWhenNotUploaded() {
11981214
final TaskDescription task = TaskDescription
11991215
.builder()
12001216
.chainTaskId(CHAIN_TASK_ID)
1201-
.resultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
1217+
.dealParams(dealParams)
12021218
.build();
12031219

12041220
when(iexecHubService.repeatIsRevealedTrue(CHAIN_TASK_ID, WALLET_WORKER_1))

‎src/test/java/com/iexec/core/result/ResultServiceTests.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.iexec.core.result;
1818

19+
import com.iexec.commons.poco.chain.DealParams;
1920
import com.iexec.commons.poco.chain.WorkerpoolAuthorization;
2021
import com.iexec.commons.poco.security.Signature;
2122
import com.iexec.commons.poco.task.TaskDescription;
@@ -70,9 +71,12 @@ class ResultServiceTests {
7071
private Credentials schedulerCreds;
7172
private Signature signature;
7273
private WorkerpoolAuthorization workerpoolAuthorization;
74+
private final DealParams dealParams = DealParams.builder()
75+
.iexecResultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
76+
.build();
7377
private final TaskDescription taskDescription = TaskDescription.builder()
7478
.chainTaskId(CHAIN_TASK_ID)
75-
.resultStorageProvider(IPFS_RESULT_STORAGE_PROVIDER)
79+
.dealParams(dealParams)
7680
.build();
7781

7882
@BeforeEach

0 commit comments

Comments
 (0)