From c7ce93365373cbb7251a4b23f34e0e1174f95fb9 Mon Sep 17 00:00:00 2001 From: Catenocrypt Date: Wed, 19 Aug 2020 22:35:36 +0200 Subject: [PATCH] Revert "Simplify script/config, make it typed." This reverts commit c3ecf50d167a3570fbaac2bae59a112cf62ff409. --- script/action/binance.ts | 8 ++++---- script/common/config.ts | 15 +++++++++++++++ script/common/image.ts | 12 ++++++------ script/common/repo-structure.ts | 5 +++-- script/config.json | 11 +++++++++++ script/config.ts | 9 --------- 6 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 script/common/config.ts create mode 100644 script/config.json delete mode 100644 script/config.ts diff --git a/script/action/binance.ts b/script/action/binance.ts index 17d58bd19..80102ca98 100644 --- a/script/action/binance.ts +++ b/script/action/binance.ts @@ -3,7 +3,7 @@ import * as bluebird from "bluebird"; import * as fs from "fs"; import * as path from "path"; import * as chalk from 'chalk'; -import * as config from "../config"; +import * as config from "../common/config"; import { ActionInterface, CheckStepInterface } from "./interface"; import { getChainAssetsPath } from "../common/repo-structure"; import { Binance } from "../common/blockchains"; @@ -15,9 +15,9 @@ import { } from "../common/repo-structure"; const binanceChain = "binance" -const binanceUrlTokens2 = config.binanceUrlTokens2; -const binanceUrlTokens8 = config.binanceUrlTokens8; -const binanceUrlTokenAssets = config.binanceUrlTokenAssets; +const binanceUrlTokens2 = config.getConfig("binance_url_tokens2", "https://dex-atlantic.binance.org/api/v1/tokens?limit=1000"); +const binanceUrlTokens8 = config.getConfig("binance_url_tokens8", "https://dex-atlantic.binance.org/api/v1/mini/tokens?limit=1000"); +const binanceUrlTokenAssets = config.getConfig("binance_url_token_assets", "https://explorer.binance.org/api/v1/assets?page=1&rows=1000"); var cachedAssets = []; async function retrieveBep2AssetList(): Promise { diff --git a/script/common/config.ts b/script/common/config.ts new file mode 100644 index 000000000..867619624 --- /dev/null +++ b/script/common/config.ts @@ -0,0 +1,15 @@ + +const configFileName = "../config.json"; +const configData = require(configFileName); + +export function getConfig(key: string, defaultValue: any): any { + if (!configData) { + console.log(`Missing config, config file: ${configFileName}`); + return defaultValue; + } + if (!(key in configData)) { + console.log(`Missing config entry, key ${key}, config file: ${configFileName}`); + return defaultValue; + } + return configData[key]; +} diff --git a/script/common/image.ts b/script/common/image.ts index 56505732c..e82bab81d 100644 --- a/script/common/image.ts +++ b/script/common/image.ts @@ -6,13 +6,13 @@ import { getFileSizeInKilobyte } from "./filesystem"; import * as chalk from 'chalk'; -import * as config from "../config"; +import * as config from "../common/config"; -export const minLogoWidth = config.imageMinLogoWidth; -export const minLogoHeight = config.imageMinLogoHeight; -export const maxLogoWidth = config.imageMaxLogoWidth; -export const maxLogoHeight = config.imageMaxLogoHeight; -export const maxLogoSizeInKilobyte = config.imageMaxLogoSizeKb; +export const minLogoWidth = config.getConfig("image_min_logo_width", 64); +export const minLogoHeight = config.getConfig("image_min_logo_height", 64); +export const maxLogoWidth = config.getConfig("image_max_logo_width", 512); +export const maxLogoHeight = config.getConfig("image_max_logo_height", 512); +export const maxLogoSizeInKilobyte = config.getConfig("image_logo_size_kb", 100); export function isDimensionTooLarge(width: number, height: number): boolean { return (width > maxLogoWidth) || (height > maxLogoHeight); diff --git a/script/common/repo-structure.ts b/script/common/repo-structure.ts index d47259453..c5e186e4b 100644 --- a/script/common/repo-structure.ts +++ b/script/common/repo-structure.ts @@ -3,7 +3,7 @@ import { isPathExistsSync, readDirSync } from "./filesystem"; -import * as config from "../config"; +import * as config from "./config"; export const logoName = `logo`; export const infoName = `info`; @@ -47,4 +47,5 @@ export const getChainAssetsList = (chain: string): string[] => readDirSync(getCh export const getChainAssetFilesList = (chain: string, address: string) => readDirSync(getChainAssetPath(chain, address)); export const getChainValidatorsAssets = (chain: string): string[] => readDirSync(getChainValidatorsAssetsPath(chain)); -export const rootDirAllowedFiles = config.foldersRootdirAllowedFiles; +const defaultRootDirAllowedFiles = [".github", "blockchains", "dapps", "media", "script", "test", ".gitignore", "LICENSE", "package-lock.json", "package.json", "README.md", ".git", "Gemfile", "Gemfile.lock"]; +export const rootDirAllowedFiles = config.getConfig("folders_rootdir_allowed_files", defaultRootDirAllowedFiles); diff --git a/script/config.json b/script/config.json new file mode 100644 index 000000000..a15bcffd5 --- /dev/null +++ b/script/config.json @@ -0,0 +1,11 @@ +{ + "image_max_logo_width": 512, + "image_max_logo_height": 512, + "image_min_logo_width": 64, + "image_min_logo_height": 64, + "image_logo_size_kb": 100, + "folders_rootdir_allowed_files": [".github", "blockchains", "dapps", "media", "node_modules", "script-old", "script", "test", ".gitignore", "azure-pipelines.yml", "jest.config.js", "LICENSE", "package-lock.json", "package.json", "README.md", ".git", "pricing", "dangerfile.ts", "Gemfile", "Gemfile.lock"], + "binance_url_tokens2": "https://dex-atlantic.binance.org/api/v1/tokens?limit=1000", + "binance_url_tokens8": "https://dex-atlantic.binance.org/api/v1/mini/tokens?limit=1000", + "binance_url_token_assets": "https://explorer.binance.org/api/v1/assets?page=1&rows=1000" +} diff --git a/script/config.ts b/script/config.ts deleted file mode 100644 index 98f9b8331..000000000 --- a/script/config.ts +++ /dev/null @@ -1,9 +0,0 @@ -export const imageMaxLogoWidth: number = 512; -export const imageMaxLogoHeight: number = 512; -export const imageMinLogoWidth: number = 64; -export const imageMinLogoHeight: number = 64; -export const imageMaxLogoSizeKb: number = 100; -export const foldersRootdirAllowedFiles: string[] = [".github", "blockchains", "dapps", "media", "node_modules", "script-old", "script", "test", ".gitignore", "azure-pipelines.yml", "jest.config.js", "LICENSE", "package-lock.json", "package.json", "README.md", ".git", "pricing", "dangerfile.ts", "Gemfile", "Gemfile.lock"]; -export const binanceUrlTokens2: string = "https://dex-atlantic.binance.org/api/v1/tokens?limit=1000"; -export const binanceUrlTokens8: string = "https://dex-atlantic.binance.org/api/v1/mini/tokens?limit=1000"; -export const binanceUrlTokenAssets: string = "https://explorer.binance.org/api/v1/assets?page=1&rows=1000";