Add await to calculate root (#3416) (#3418)

* Add await to calculate root (#3416) * Add await * version bump * package update * Add async for getMerkleProof * Add await to tests * more awaits
OriginTrail · Nov 20, 2024 · 4ccdd1f · 4ccdd1f
1 parent f36a7a5
commit 4ccdd1f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 27 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.2",
     "description": "OTNode V8",
     "main": "index.js",
     "type": "module",
@@ -73,7 +73,7 @@
         "@polkadot/util": "^10.1.7",
         "@polkadot/util-crypto": "^10.1.7",
         "app-root-path": "^3.1.0",
-        "assertion-tools": "^2.2.0",
+        "assertion-tools": "^2.2.1",
         "async": "^3.2.4",
         "async-mutex": "^0.3.2",
         "awilix": "^7.0.3",

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/commands/protocols/common/submit-proofs-command.js b/src/commands/protocols/common/submit-proofs-command.js
@@ -84,7 +84,7 @@ class SubmitProofsCommand extends SendTransactionCommand {
             return Command.empty();
         }
 
-        const { leaf, proof } = this.validationModuleManager.getMerkleProof(
+        const { leaf, proof } = await this.validationModuleManager.getMerkleProof(
             assertion,
             Number(challenge),
         );

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,11 +12,11 @@ class MerkleValidation {
         };
     }
 
-    calculateRoot(assertion) {
+    async calculateRoot(assertion) {
         return calculateRoot(assertion);
     }
 
-    getMerkleProof(nquadsArray, challenge) {
+    async getMerkleProof(nquadsArray, challenge) {
         return getMerkleProof(nquadsArray, challenge);
     }
 

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.');
@@ -15,7 +15,7 @@ class ValidationModuleManager extends BaseModuleManager {
         throw new Error('Validation module is not initialized.');
     }
 
-    getMerkleProof(assertion, index) {
+    async getMerkleProof(assertion, index) {
         if (this.initialized) {
             if (!assertion) {
                 throw new Error('Get merkle proof 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

diff --git a/test/unit/modules/validation/validation-module-manager.test.js b/test/unit/modules/validation/validation-module-manager.test.js
@@ -49,8 +49,8 @@ describe.only('Validation module manager', async () => {
     });
 
     it('validate successful root hash calculation, expect to be matched', async () => {
-        const expectedRootHash = calculateRoot(assertion);
-        const calculatedRootHash = validationManager.calculateRoot(assertion);
+        const expectedRootHash = await calculateRoot(assertion);
+        const calculatedRootHash = await validationManager.calculateRoot(assertion);
 
         assert(expect(calculatedRootHash).to.exist);
         expect(calculatedRootHash).to.equal(expectedRootHash);
@@ -60,7 +60,7 @@ describe.only('Validation module manager', async () => {
         validationManager.initialized = false;
 
         try {
-            validationManager.calculateRoot(assertion);
+            await validationManager.calculateRoot(assertion);
         } catch (error) {
             expect(error.message).to.equal('Validation module is not initialized.');
         }
@@ -76,7 +76,7 @@ describe.only('Validation module manager', async () => {
     });
 
     it('successful getting merkle proof hash', async () => {
-        const calculatedMerkleHash = validationManager.getMerkleProof(assertion, 0);
+        const calculatedMerkleHash = await validationManager.getMerkleProof(assertion, 0);
 
         assert(expect(calculatedMerkleHash).to.exist);
         expect(calculatedMerkleHash).to.be.instanceof(Object);
@@ -88,19 +88,20 @@ describe.only('Validation module manager', async () => {
         validationManager.initialized = false;
 
         try {
-            validationManager.getMerkleProof(assertion, 0);
+            await validationManager.getMerkleProof(assertion, 0);
         } catch (error) {
             expect(error.message).to.equal('Validation module is not initialized.');
         }
     });
 
-    it('failed merkle prof hash calculation when assertion is null or undefined', async () => {
-        invalidValues.forEach((value) => {
-            expect(() => validationManager.getMerkleProof(value, 0)).to.throw(
+    it('failed merkle proof hash calculation when assertion is null or undefined', async () => {
+        for (const value of invalidValues) {
+            // eslint-disable-next-line no-await-in-loop
+            expect(await validationManager.getMerkleProof(value, 0)).to.be.rejectedWith(
                 Error,
                 'Get merkle proof failed: Assertion cannot be null or undefined.',
             );
-        });
+        }
     });
 
     it('validate getting function name', async () => {