chore: move is* functions to common

axelarnetwork · Jul 26, 2024 · 3acb915 · 3acb915
1 parent 50fd8f6
commit 3acb915
Show file tree

Hide file tree

Showing 2 changed files with 73 additions and 96 deletions.
diff --git a/common/utils.js b/common/utils.js
@@ -46,6 +46,56 @@ function printLog(log) {
     console.log(JSON.stringify({ log }, null, 2));
 }
 
+const isNonEmptyString = (arg) => {
+    return typeof arg === 'string' && arg !== '';
+};
+
+const isString = (arg) => {
+    return typeof arg === 'string';
+};
+
+const isStringArray = (arr) => Array.isArray(arr) && arr.every(isString);
+
+const isNumber = (arg) => {
+    return Number.isInteger(arg);
+};
+
+const isValidNumber = (arg) => {
+    return !isNaN(parseInt(arg)) && isFinite(arg);
+};
+
+const isValidDecimal = (arg) => {
+    return !isNaN(parseFloat(arg)) && isFinite(arg);
+};
+
+const isNumberArray = (arr) => {
+    if (!Array.isArray(arr)) {
+        return false;
+    }
+
+    for (const item of arr) {
+        if (!isNumber(item)) {
+            return false;
+        }
+    }
+
+    return true;
+};
+
+const isNonEmptyStringArray = (arr) => {
+    if (!Array.isArray(arr)) {
+        return false;
+    }
+
+    for (const item of arr) {
+        if (typeof item !== 'string') {
+            return false;
+        }
+    }
+
+    return true;
+};
+
 module.exports = {
     loadConfig,
     saveConfig,
@@ -54,4 +104,12 @@ module.exports = {
     printWarn,
     printError,
     printLog,
+    isNonEmptyString,
+    isString,
+    isStringArray,
+    isNumber,
+    isValidNumber,
+    isValidDecimal,
+    isNumberArray,
+    isNonEmptyStringArray,
 };
diff --git a/evm/utils.js b/evm/utils.js
@@ -13,10 +13,23 @@ const https = require('https');
 const http = require('http');
 const fs = require('fs');
 const path = require('path');
-const { outputJsonSync } = require('fs-extra');
 const readlineSync = require('readline-sync');
 const chalk = require('chalk');
-const { loadConfig, saveConfig } = require('../common');
+const {
+    loadConfig,
+    saveConfig,
+    isNonEmptyString,
+    isNonEmptyStringArray,
+    isNumber,
+    isNumberArray,
+    isString,
+    isValidNumber,
+    printInfo,
+    isValidDecimal,
+    printError,
+    printWarn,
+    writeJSON,
+} = require('../common');
 const {
     create3DeployContract,
     deployContractConstant,
@@ -123,41 +136,6 @@ const deployCreate3 = async (
     return contract;
 };
 
-const printInfo = (msg, info = '', colour = chalk.green) => {
-    if (info) {
-        console.log(`${msg}: ${colour(info)}\n`);
-    } else {
-        console.log(`${msg}\n`);
-    }
-};
-
-const printWarn = (msg, info = '') => {
-    if (info) {
-        msg = `${msg}: ${info}`;
-    }
-
-    console.log(`${chalk.italic.yellow(msg)}\n`);
-};
-
-const printError = (msg, info = '') => {
-    if (info) {
-        msg = `${msg}: ${info}`;
-    }
-
-    console.log(`${chalk.bold.red(msg)}\n`);
-};
-
-function printLog(log) {
-    console.log(JSON.stringify({ log }, null, 2));
-}
-
-const writeJSON = (data, name) => {
-    outputJsonSync(name, data, {
-        spaces: 2,
-        EOL: '\n',
-    });
-};
-
 const httpGet = (url) => {
     return new Promise((resolve, reject) => {
         (url.startsWith('https://') ? https : http).get(url, (res) => {
@@ -205,56 +183,6 @@ const httpPost = async (url, data) => {
     return response.json();
 };
 
-const isNonEmptyString = (arg) => {
-    return typeof arg === 'string' && arg !== '';
-};
-
-const isString = (arg) => {
-    return typeof arg === 'string';
-};
-
-const isStringArray = (arr) => Array.isArray(arr) && arr.every(isString);
-
-const isNumber = (arg) => {
-    return Number.isInteger(arg);
-};
-
-const isValidNumber = (arg) => {
-    return !isNaN(parseInt(arg)) && isFinite(arg);
-};
-
-const isValidDecimal = (arg) => {
-    return !isNaN(parseFloat(arg)) && isFinite(arg);
-};
-
-const isNumberArray = (arr) => {
-    if (!Array.isArray(arr)) {
-        return false;
-    }
-
-    for (const item of arr) {
-        if (!isNumber(item)) {
-            return false;
-        }
-    }
-
-    return true;
-};
-
-const isNonEmptyStringArray = (arr) => {
-    if (!Array.isArray(arr)) {
-        return false;
-    }
-
-    for (const item of arr) {
-        if (typeof item !== 'string') {
-            return false;
-        }
-    }
-
-    return true;
-};
-
 const isAddressArray = (arr) => {
     if (!Array.isArray(arr)) return false;
 
@@ -1268,22 +1196,13 @@ module.exports = {
     deployCreate2,
     deployCreate3,
     deployContract,
-    writeJSON,
     copyObject,
     httpGet,
     httpPost,
     printObj,
     getBytecodeHash,
     predictAddressCreate,
     getDeployedAddress,
-    isString,
-    isNonEmptyString,
-    isStringArray,
-    isNumber,
-    isValidNumber,
-    isValidDecimal,
-    isNumberArray,
-    isNonEmptyStringArray,
     isAddressArray,
     isKeccak256Hash,
     isValidCalldata,