fix errors related to typeChecking and verification functions usage

Author: Tomas-Silva2187

packages/cactus-plugin-satp-hermes/src/main/typescript/services/utils.ts

@@ -15,10 +15,14 @@ export function getEnumValueByKey<T extends object>(
 
 export interface chainConfigElement<T> {
   configElement: string;
-  configElementType?: T;
-  configElementTypeguard?: (value: unknown, log: Logger) => boolean;
+  configElementType?: T | string;
+  configElementTypeguard?:
+    | ((value: unknown, log: Logger) => boolean)
+    | ((value: unknown) => boolean);
   configSubElementType?: T;
-  configSubElementFunctionTypeguard?: (value: unknown, log: Logger) => boolean;
+  configSubElementFunctionTypeguard?:
+    | ((value: unknown, log: Logger) => boolean)
+    | ((value: unknown) => boolean);
 }
 
 export function identifyAndCheckConfigFormat<T>(
@@ -81,9 +85,10 @@ export function checkConfigElementFormat<T>(
       );
       return false;
     }
+
     if (
       ccElement.configElementType &&
-      typeof obj[ccElement.configElement] !== typeof ccElement.configElementType
+      typeof obj[ccElement.configElement] !== ccElement.configElementType
     ) {
       log.error(
         `${fnTag}: ${ccElement.configElement} present but not of type ${ccElement.configElementType}`,
@@ -98,19 +103,7 @@ export function checkConfigElementFormat<T>(
       );
       return false;
     } else {
-      if (
-        ccElement.configElementType === Array &&
-        !ccElement.configSubElementType &&
-        !ccElement.configSubElementFunctionTypeguard
-      ) {
-        log.error(
-          `${fnTag}: ${ccElement.configElement} is an array but no type check is provided for its elements`,
-        );
-        return false;
-      } else if (
-        ccElement.configElementType === Array &&
-        ccElement.configSubElementType
-      ) {
+      if (ccElement.configSubElementType) {
         obj[ccElement.configElement].forEach((subEl: unknown) => {
           if (
             typeof subEl !== typeof ccElement.configSubElementType ||
@@ -122,10 +115,7 @@ export function checkConfigElementFormat<T>(
             return false;
           }
         });
-      } else if (
-        ccElement.configElementType === Array &&
-        ccElement.configSubElementFunctionTypeguard
-      ) {
+      } else if (ccElement.configSubElementFunctionTypeguard) {
         obj[ccElement.configElement].forEach((subEl: unknown) => {
           if (
             !ccElement.configSubElementFunctionTypeguard!(subEl, log) ||

packages/cactus-plugin-satp-hermes/src/main/typescript/services/validation/config-validating-functions/bridges-config-validating-functions/validate-besu-config.ts

@@ -137,28 +137,28 @@ export function isBesuConfigJSON(
   const optionalConfigElements: chainConfigElement<unknown>[] = [
     {
       configElement: "leafId",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "keyPair",
-      configElementType: Object,
+      configElementType: "object",
     },
     {
       configElement: "claimFormats",
-      configElementType: Array,
+      configElementTypeguard: Array.isArray,
       configSubElementFunctionTypeguard: isClaimFormat,
     },
     {
       configElement: "wrapperContractName",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "wrapperContractAddress",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "gas",
-      configElementType: Number,
+      configElementType: "number",
     },
   ];
 

packages/cactus-plugin-satp-hermes/src/main/typescript/services/validation/config-validating-functions/bridges-config-validating-functions/validate-ethereum-config.ts

@@ -181,27 +181,27 @@ export function isEthereumConfigJSON(
   const configOptionalFields: chainConfigElement<unknown>[] = [
     {
       configElement: "wrapperContractName",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "wrapperContractAddress",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "gasConfig",
       configElementTypeguard: isGasConfig,
     },
     {
       configElement: "leafId",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "keyPair",
-      configElementType: Object,
+      configElementType: "object",
     },
     {
       configElement: "claimFormats",
-      configElementType: Array,
+      configElementTypeguard: Array.isArray,
       configSubElementFunctionTypeguard: isClaimFormat,
     },
   ];

packages/cactus-plugin-satp-hermes/src/main/typescript/services/validation/config-validating-functions/bridges-config-validating-functions/validate-fabric-config.ts

@@ -184,7 +184,7 @@ export function isFabricConfigJSON(
   const configDefaultFields: chainConfigElement<unknown>[] = [
     {
       configElement: "channelName",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "userIdentity",
@@ -200,59 +200,59 @@ export function isFabricConfigJSON(
     },
     {
       configElement: "caFilePath",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "coreYamlFilePath",
-      configElementType: String,
+      configElementType: "string",
     },
   ];
 
   const configOptionalFields: chainConfigElement<unknown>[] = [
     {
       configElement: "targetOrganizations",
-      configElementType: Array,
-      configSubElementType: Object,
+      configElementTypeguard: Array.isArray,
+      configSubElementType: "object",
     },
     {
       configElement: "ccSequence",
-      configElementType: Number,
+      configElementType: "number",
     },
     {
       configElement: "orderer",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "ordererTLSHostnameOverride",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "connTimeout",
-      configElementType: Number,
+      configElementType: "number",
     },
     {
       configElement: "signaturePolicy",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "mspId",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "wrapperContractName",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "leafId",
-      configElementType: String,
+      configElementType: "string",
     },
     {
       configElement: "keyPair",
       configElementTypeguard: isKeyPairJSON,
     },
     {
       configElement: "claimFormats",
-      configElementType: Array,
+      configElementTypeguard: Array.isArray,
       configSubElementFunctionTypeguard: isClaimFormat,
     },
   ];