Merge pull request #4049 from OriginTrail/fix/finalization-error-handling

Add fix for missing error

Author: Mihajlo-Pavlovic

src/commands/protocols/publish/publish-finalization-command.js

@@ -84,15 +84,7 @@ class PublishFinalizationCommand extends Command {
         const ual = this.ualService.deriveUAL(blockchain, contractAddress, id);
 
         try {
-            await this.validatePublishData(
-                operationId,
-                blockchain,
-                merkleRoot,
-                cachedMerkleRoot,
-                byteSize,
-                assertion,
-                ual,
-            );
+            await this.validatePublishData(merkleRoot, cachedMerkleRoot, byteSize, assertion, ual);
         } catch (e) {
             this.logger.error(`Failed to validate publish data: ${e.message}`);
             this.operationIdService.emitChangeEvent(
@@ -173,52 +165,21 @@ class PublishFinalizationCommand extends Command {
         return Command.empty();
     }
 
-    async validatePublishData(
-        operationId,
-        blockchain,
-        merkleRoot,
-        cachedMerkleRoot,
-        byteSize,
-        assertion,
-        ual,
-    ) {
-        try {
-            if (merkleRoot !== cachedMerkleRoot) {
-                const errorMessage = `Invalid Merkle Root for Knowledge Collection: ${ual}. Received value from blockchain: ${merkleRoot}, Cached value from publish operation: ${cachedMerkleRoot}`;
-
-                this.logger.error(`Command error (${this.errorType}): ${errorMessage}`);
-
-                this.operationIdService.emitChangeEvent(
-                    OPERATION_ID_STATUS.FAILED,
-                    operationId,
-                    blockchain,
-                );
-            }
-
-            const calculatedAssertionSize = this.dataService.calculateAssertionSize(
-                assertion.public ?? assertion,
-            );
+    async validatePublishData(merkleRoot, cachedMerkleRoot, byteSize, assertion, ual) {
+        if (merkleRoot !== cachedMerkleRoot) {
+            const errorMessage = `Invalid Merkle Root for Knowledge Collection: ${ual}. Received value from blockchain: ${merkleRoot}, Cached value from publish operation: ${cachedMerkleRoot}`;
 
-            if (byteSize.toString() !== calculatedAssertionSize.toString()) {
-                const errorMessage = `Invalid Assertion Size for Knowledge Collection: ${ual}. Received value from blockchain: ${byteSize}, Calculated value: ${calculatedAssertionSize}`;
+            throw new Error(errorMessage);
+        }
 
-                this.logger.error(`Command error (${this.errorType}): ${errorMessage}`);
+        const calculatedAssertionSize = this.dataService.calculateAssertionSize(
+            assertion.public ?? assertion,
+        );
 
-                this.operationIdService.emitChangeEvent(
-                    OPERATION_ID_STATUS.FAILED,
-                    operationId,
-                    blockchain,
-                );
-            }
-        } catch (e) {
-            this.logger.error(`Command error (${this.errorType}): ${e.message}`);
+        if (byteSize.toString() !== calculatedAssertionSize.toString()) {
+            const errorMessage = `Invalid Assertion Size for Knowledge Collection: ${ual}. Received value from blockchain: ${byteSize}, Calculated value: ${calculatedAssertionSize}`;
 
-            this.operationIdService.emitChangeEvent(
-                OPERATION_ID_STATUS.FAILED,
-                operationId,
-                blockchain,
-            );
-            throw e;
+            throw new Error(errorMessage);
         }
     }