Merge pull request #306 from iExecBlockchainComputing/feature/callback

Feature/callback

Author: james-toussaint

src/main/java/com/iexec/worker/docker/CustomDockerClient.java

@@ -57,7 +57,6 @@ public CustomDockerClient() throws DockerCertificateException {
 
     public boolean pullImage(String chainTaskId, String image) {
         log.info("Image pull started [chainTaskId:{}, image:{}]", chainTaskId, image);
-
         try {
             docker.pull(image);
         } catch (DockerException | InterruptedException e) {

src/main/java/com/iexec/worker/result/ResultService.java

@@ -200,6 +200,14 @@ private String getNonTeeDeterminismHash(String chainTaskId) {
         Path determinismFilePath = Paths.get(filePath);
 
         try {
+            String callbackFilePathName = workerConfigService.getTaskIexecOutDir(chainTaskId)
+                    + File.separator + CALLBACK_FILE_NAME;
+
+            String callbackData = getCallbackDataFromPath(callbackFilePathName);
+            if (!callbackData.isEmpty()){
+                return Hash.sha3(callbackData);
+            }
+
             if (determinismFilePath.toFile().exists()) {
                 hash = getHashFromDeterminismIexecFile(determinismFilePath);
                 log.info("Determinism file found and its hash has been computed "