Merge pull request #2678 from OriginTrail/bugfix/get-and-finalization-2

Added missing await and folder existance check

package.json

@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "6.0.13+hotfix.1",
+    "version": "6.0.13+hotfix.2",
     "description": "OTNode V6",
     "main": "index.js",
     "type": "module",

src/service/pending-storage-service.js

@@ -73,7 +73,7 @@ class PendingStorageService {
             `Removing cached assertion for ual: ${ual} operation id: ${operationId} from file in ${repository} pending storage`,
         );
 
-        const pendingAssertionPath = this.fileService.getPendingStorageDocumentPath(
+        const pendingAssertionPath = await this.fileService.getPendingStorageDocumentPath(
             repository,
             blockchain,
             contract,
@@ -83,11 +83,17 @@ class PendingStorageService {
         await this.fileService.removeFile(pendingAssertionPath);
 
         const pendingStorageFolderPath = this.fileService.getParentDirectory(pendingAssertionPath);
-        const otherPendingAssertions = await this.fileService.readDirectory(
+        const pendingStorageFolderExists = await this.fileService.pathExists(
             pendingStorageFolderPath,
         );
-        if (otherPendingAssertions.length === 0) {
-            await this.fileService.removeFolder(pendingStorageFolderPath);
+
+        if (pendingStorageFolderExists) {
+            const otherPendingAssertions = await this.fileService.readDirectory(
+                pendingStorageFolderPath,
+            );
+            if (otherPendingAssertions.length === 0) {
+                await this.fileService.removeFolder(pendingStorageFolderPath);
+            }
         }
     }