Merge pull request #2700 from OriginTrail/v6/bugfix/update-root-hash-…

…validation-on-get Updated check for root hash
OriginTrail · Sep 7, 2023 · 40c317c · 40c317c
2 parents 4f44e4c + f6066d3
commit 40c317c
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 47 deletions.
diff --git a/src/service/validation-service.js b/src/service/validation-service.js
@@ -34,7 +34,6 @@ class ValidationService {
         this.validateAssertionId(assertion, assertionId);
 
         // TODO: get assertion data in one call
-
         await this.validateAssertionSize(blockchain, assertionId, assertion);
         await this.validateTriplesNumber(blockchain, assertionId, assertion);
         await this.validateChunkSize(blockchain, assertionId, assertion);
@@ -56,7 +55,8 @@ class ValidationService {
         }
         const assertionSize = assertionMetadata.getAssertionSizeInBytes(assertion);
         if (blockchainAssertionSize !== assertionSize) {
-            throw Error(
+            // todo after corrective component is implemented, update this logic
+            this.logger.warn(
                 `Invalid assertion size, value read from blockchain: ${blockchainAssertionSize}, calculated: ${assertionSize}`,
             );
         }
@@ -90,7 +90,8 @@ class ValidationService {
         const calculatedAssertionId = this.validationModuleManager.calculateRoot(assertion);
 
         if (assertionId !== calculatedAssertionId) {
-            throw Error(
+            // todo after corrective component is implemented, update this logic
+            this.logger.warn(
                 `Invalid assertion id. Received value: ${assertionId}, calculated: ${calculatedAssertionId}`,
             );
         }

diff --git a/test/unit/service/validation-service.test.js b/test/unit/service/validation-service.test.js
@@ -49,22 +49,23 @@ describe('Validation service test', async () => {
     });
 
     it('Tries to validate assertion but fails due to assertion size mismatch', async () => {
-        let errorThrown = false;
-        try {
-            await validationService.validateAssertion(
-                '0xde58cc52a5ce3a04ae7a05a13176226447ac02489252e4d37a72cbe0aea46b42',
-                'hardhat',
-                {
-                    '@context': 'https://schema.org',
-                    '@id': 'https://tesla.modelX/2321',
-                    '@type': 'Car',
-                    name: 'Tesla Model X',
-                },
-            );
-        } catch (error) {
-            errorThrown = true;
-        }
-        expect(errorThrown).to.be.true;
+        // todo after corrective component is implemented, update this logic
+        // let errorThrown = false;
+        // try {
+        //     await validationService.validateAssertion(
+        //         '0xde58cc52a5ce3a04ae7a05a13176226447ac02489252e4d37a72cbe0aea46b42',
+        //         'hardhat',
+        //         {
+        //             '@context': 'https://schema.org',
+        //             '@id': 'https://tesla.modelX/2321',
+        //             '@type': 'Car',
+        //             name: 'Tesla Model X',
+        //         },
+        //     );
+        // } catch (error) {
+        //     errorThrown = true;
+        // }
+        // expect(errorThrown).to.be.true;
     });
 
     it('Tries to validate assertion but fails due to triple number mismatch', async () => {
@@ -136,34 +137,35 @@ describe('Validation service test', async () => {
     });
 
     it('Tries to validate assertion but fails due to validation manager returning wrong assertion id', async () => {
+        // todo after corrective component is implemented, update this logic
         // Will lead to mismatch with passed assertion id
-        validationService.validationModuleManager.calculateRoot = (assertion) => '';
-
-        let errorThrown = false;
-        try {
-            await validationService.validateAssertion(
-                '0xde58cc52a5ce3a04ae7a05a13176226447ac02489252e4d37a72cbe0aea46b42',
-                'hardhat',
-                {
-                    '@context': 'https://schema.org',
-                    '@id': 'https://tesla.modelX/2321',
-                    '@type': 'Car',
-                    name: 'Tesla Model X',
-                    brand: {
-                        '@type': 'Brand',
-                        name: 'Tesla',
-                    },
-                    model: 'Model X',
-                    manufacturer: {
-                        '@type': 'Organization',
-                        name: 'Tesla, Inc.',
-                    },
-                    fuelType: 'Electric',
-                },
-            );
-        } catch (error) {
-            errorThrown = true;
-        }
-        expect(errorThrown).to.be.true;
+        // validationService.validationModuleManager.calculateRoot = (assertion) => '';
+        //
+        // let errorThrown = false;
+        // try {
+        //     await validationService.validateAssertion(
+        //         '0xde58cc52a5ce3a04ae7a05a13176226447ac02489252e4d37a72cbe0aea46b42',
+        //         'hardhat',
+        //         {
+        //             '@context': 'https://schema.org',
+        //             '@id': 'https://tesla.modelX/2321',
+        //             '@type': 'Car',
+        //             name: 'Tesla Model X',
+        //             brand: {
+        //                 '@type': 'Brand',
+        //                 name: 'Tesla',
+        //             },
+        //             model: 'Model X',
+        //             manufacturer: {
+        //                 '@type': 'Organization',
+        //                 name: 'Tesla, Inc.',
+        //             },
+        //             fuelType: 'Electric',
+        //         },
+        //     );
+        // } catch (error) {
+        //     errorThrown = true;
+        // }
+        // expect(errorThrown).to.be.true;
     });
 });