Add await to calculate root (#3416)

* Add await * version bump
OriginTrail · Nov 18, 2024 · 2884d02 · 2884d02
1 parent 090e93a
commit 2884d02
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "origintrail_node",
-    "version": "8.1.3+beta.0",
+    "version": "8.1.3+beta.1",
     "description": "OTNode V8",
     "main": "index.js",
     "type": "module",

diff --git a/src/commands/common/validate-asset-command.js b/src/commands/common/validate-asset-command.js
@@ -86,7 +86,7 @@ class ValidateAssetCommand extends Command {
             );
 
             try {
-                this.validationService.validateAssertionId(
+                await this.validationService.validateAssertionId(
                     cachedData.private.assertion,
                     cachedData.private.assertionId,
                 );

diff --git a/src/migration/pending-storage-migration.js b/src/migration/pending-storage-migration.js
@@ -20,7 +20,7 @@ class PendingStorageMigration extends BaseMigration {
                     const cachedData = await this.fileService.readFile(newDirectoryPath, true);
                     await this.fileService.removeFile(newDirectoryPath);
                     if (cachedData?.public?.assertion) {
-                        const newDocumentName = calculateRoot(cachedData.public.assertion);
+                        const newDocumentName = await calculateRoot(cachedData.public.assertion);
                         await this.fileService.writeContentsToFile(
                             newDirectoryPath,
                             newDocumentName,

diff --git a/src/modules/validation/implementation/merkle-validation.js b/src/modules/validation/implementation/merkle-validation.js
@@ -12,7 +12,7 @@ class MerkleValidation {
         };
     }
 
-    calculateRoot(assertion) {
+    async calculateRoot(assertion) {
         return calculateRoot(assertion);
     }
 

diff --git a/src/modules/validation/validation-module-manager.js b/src/modules/validation/validation-module-manager.js
@@ -5,7 +5,7 @@ class ValidationModuleManager extends BaseModuleManager {
         return 'validation';
     }
 
-    calculateRoot(assertion) {
+    async calculateRoot(assertion) {
         if (this.initialized) {
             if (!assertion) {
                 throw new Error('Calculation failed: Assertion cannot be null or undefined.');

diff --git a/src/service/validation-service.js b/src/service/validation-service.js
@@ -34,7 +34,7 @@ class ValidationService {
     async validateAssertion(assertionId, blockchain, assertion) {
         this.logger.info(`Validating assertionId: ${assertionId}`);
 
-        this.validateAssertionId(assertion, assertionId);
+        await this.validateAssertionId(assertion, assertionId);
         const blockchainAssertionData = await this.blockchainModuleManager.getAssertionData(
             blockchain,
             assertionId,
@@ -80,8 +80,8 @@ class ValidationService {
         }
     }
 
-    validateAssertionId(assertion, assertionId) {
-        const calculatedAssertionId = this.validationModuleManager.calculateRoot(assertion);
+    async validateAssertionId(assertion, assertionId) {
+        const calculatedAssertionId = await this.validationModuleManager.calculateRoot(assertion);
 
         if (assertionId !== calculatedAssertionId) {
             // todo after corrective component is implemented, update this logic