Merge pull request #408 from iExecBlockchainComputing/feature/contrib…

…ute-and-finalize-replicate-status Add `ContributeAndFinalized` replicate statuses
iExecBlockchainComputing · May 3, 2023 · 33d68b8 · 33d68b8
2 parents b1d8d34 + b585b98
commit 33d68b8
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [[NEXT]](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/vNEXT) 2023
 
+### New Features
+- Add `CONTRIBUTE_AND_FINALIZE` replicate statuses. (#408)
+### Bug Fixes
+- Log `computedFilePath` instead of `computedFileDir`. (#409)
+
 ## [[8.0.0]](https://github.com/iExecBlockchainComputing/iexec-common/releases/tag/v8.0.0) 2023-04-12
 
 ### Quality

diff --git a/src/main/java/com/iexec/common/replicate/ReplicateStatus.java b/src/main/java/com/iexec/common/replicate/ReplicateStatus.java
@@ -49,6 +49,9 @@ public enum ReplicateStatus {
     RESULT_UPLOADING,
     RESULT_UPLOAD_FAILED,
     RESULT_UPLOADED,
+    CONTRIBUTE_AND_FINALIZE_ONGOING,
+    CONTRIBUTE_AND_FINALIZE_FAILED,
+    CONTRIBUTE_AND_FINALIZE_DONE,
     COMPLETING,
     COMPLETE_FAILED,
     COMPLETED,
@@ -102,6 +105,8 @@ public static List<ReplicateStatus> getSuccessStatuses() {
                 CONTRIBUTED,
                 REVEALING,
                 REVEALED,
+                CONTRIBUTE_AND_FINALIZE_ONGOING,
+                CONTRIBUTE_AND_FINALIZE_DONE,
                 COMPLETING,
                 COMPLETED));
     }
@@ -116,6 +121,7 @@ public static List<ReplicateStatus> getFailureStatuses() {
                 REVEAL_FAILED,
                 RESULT_UPLOAD_REQUEST_FAILED,
                 RESULT_UPLOAD_FAILED,
+                CONTRIBUTE_AND_FINALIZE_FAILED,
                 COMPLETE_FAILED,
                 FAILED);
     }
@@ -132,6 +138,7 @@ public static List<ReplicateStatus> getCompletableStatuses() {
                 RESULT_UPLOADING,
                 RESULT_UPLOAD_FAILED,
                 RESULT_UPLOADED,
+                CONTRIBUTE_AND_FINALIZE_DONE,
                 COMPLETING,
                 COMPLETE_FAILED);
     }
@@ -160,6 +167,8 @@ public static List<ReplicateStatus> getFailableStatuses() {
                 CONTRIBUTED,
                 REVEALING,
                 REVEAL_FAILED,
+                CONTRIBUTE_AND_FINALIZE_ONGOING,
+                CONTRIBUTE_AND_FINALIZE_FAILED,
                 ABORTED);
     }
 
@@ -198,6 +207,9 @@ public static List<ReplicateStatus> getRecoverableStatuses() {
                 RESULT_UPLOADING,
                 RESULT_UPLOAD_FAILED,           // can complete later
                 RESULT_UPLOADED,
+                CONTRIBUTE_AND_FINALIZE_ONGOING,
+                CONTRIBUTE_AND_FINALIZE_DONE,
+                CONTRIBUTE_AND_FINALIZE_FAILED,
                 COMPLETING,
                 RECOVERING);
     }
@@ -249,6 +261,9 @@ public static List<ReplicateStatus> getNonFinalWorkflowStatuses() {
                 RESULT_UPLOADING,
                 RESULT_UPLOAD_FAILED,
                 RESULT_UPLOADED,
+                CONTRIBUTE_AND_FINALIZE_ONGOING,
+                CONTRIBUTE_AND_FINALIZE_FAILED,
+                CONTRIBUTE_AND_FINALIZE_DONE,
                 COMPLETING,
                 COMPLETE_FAILED);
     }
@@ -311,7 +326,8 @@ public static List<ReplicateStatus> getSuccessStatusesBeforeComputed() {
     public static List<ReplicateStatus> getUncompletableStatuses() {
         return Arrays.asList(
                 CONTRIBUTE_FAILED,
-                REVEAL_FAILED
+                REVEAL_FAILED,
+                CONTRIBUTE_AND_FINALIZE_FAILED
                 //RESULT_UPLOAD_REQUEST_FAILED, // still good if don't upload
                 //RESULT_UPLOAD_FAILED,         //still good if don't upload
         );