From eeab7664328cbc13ca2ba991eba192d4b3470ce1 Mon Sep 17 00:00:00 2001 From: Brian Faust Date: Mon, 29 Apr 2019 15:58:45 +0300 Subject: [PATCH] style: enable "no-use-before-declare" rule (#2501) --- package.json | 2 +- packages/core-p2p/src/utils/is-valid-peer.ts | 28 +++++------ packages/core/src/process-manager.ts | 6 ++- .../crypto/src/transactions/types/schemas.ts | 46 +++++++++---------- tslint.json | 1 + 5 files changed, 43 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index fa966f16b1..95c4333e9c 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "bootstrap": "yarn lerna bootstrap", "clean": "yarn lerna clean --yes", "build": "yarn lerna run build", - "lint": "./node_modules/tslint/bin/tslint -c ./tslint.json './packages/**/*/src/**/*.ts' --fix", + "lint": "./node_modules/tslint/bin/tslint -c ./tslint.json --project tsconfig.json './packages/**/*/src/**/*.ts' --fix", "format": "yarn lint && yarn prettier", "prettier": "prettier --write \"./*.{ts,js,json,md}\" \"./packages/**/*.{ts,js,json,md}\" \"./__tests__/**/*.{ts,js,json,md}\"", "lint:tests": "./node_modules/tslint/bin/tslint -c ./tslint.json '__tests__/**/*.ts' --fix", diff --git a/packages/core-p2p/src/utils/is-valid-peer.ts b/packages/core-p2p/src/utils/is-valid-peer.ts index 3847016497..af52458d08 100644 --- a/packages/core-p2p/src/utils/is-valid-peer.ts +++ b/packages/core-p2p/src/utils/is-valid-peer.ts @@ -1,20 +1,6 @@ import { parse, process } from "ipaddr.js"; import os from "os"; -export const isValidPeer = (peer: { ip: string; status?: string | number }): boolean => { - peer.ip = sanitizeRemoteAddress(peer.ip); - - if (!peer.ip) { - return false; - } - - if (isLocalHost(peer.ip)) { - return false; - } - - return true; -}; - export const isLocalHost = (ip: string): boolean => { try { const parsed = parse(ip); @@ -47,3 +33,17 @@ const sanitizeRemoteAddress = (ip: string): string | null => { return null; } }; + +export const isValidPeer = (peer: { ip: string; status?: string | number }): boolean => { + peer.ip = sanitizeRemoteAddress(peer.ip); + + if (!peer.ip) { + return false; + } + + if (isLocalHost(peer.ip)) { + return false; + } + + return true; +}; diff --git a/packages/core/src/process-manager.ts b/packages/core/src/process-manager.ts index ae35f71194..f02470e864 100644 --- a/packages/core/src/process-manager.ts +++ b/packages/core/src/process-manager.ts @@ -37,7 +37,7 @@ class ProcessManager { public status(name: string): ProcessState { try { - return processManager.describe(name).pm2_env.status; + return this.describe(name).pm2_env.status; } catch (error) { return undefined; } @@ -77,7 +77,9 @@ class ProcessManager { try { const { stdout } = shellSync("pm2 jlist"); - return Object.values(JSON.parse(stdout.split("\n").pop())).filter((p: ProcessDescription) => p.name.startsWith(token)); + return Object.values(JSON.parse(stdout.split("\n").pop())).filter((p: ProcessDescription) => + p.name.startsWith(token), + ); } catch (error) { return undefined; } diff --git a/packages/crypto/src/transactions/types/schemas.ts b/packages/crypto/src/transactions/types/schemas.ts index 7e8572be65..325b691fdd 100644 --- a/packages/crypto/src/transactions/types/schemas.ts +++ b/packages/crypto/src/transactions/types/schemas.ts @@ -1,24 +1,13 @@ import deepmerge = require("deepmerge"); import { TransactionTypes } from "../../enums"; -export type TransactionSchema = typeof transactionBaseSchema; - -export function extend(parent, properties): TransactionSchema { - return deepmerge(parent, properties); -} - -export function signedSchema(schema: TransactionSchema): TransactionSchema { - const signed = extend(schema, signedTransaction); - signed.$id = `${schema.$id}Signed`; - return signed; -} +const signedTransaction = { + required: ["id", "signature"], +}; -export function strictSchema(schema: TransactionSchema): TransactionSchema { - const signed = signedSchema(schema); - const strict = extend(signed, strictTransaction); - strict.$id = `${schema.$id}Strict`; - return strict; -} +const strictTransaction = { + additionalProperties: false, +}; export const transactionBaseSchema = { $id: null, @@ -39,13 +28,22 @@ export const transactionBaseSchema = { }, }; -const signedTransaction = { - required: ["id", "signature"], -}; +export function extend(parent, properties): TransactionSchema { + return deepmerge(parent, properties); +} -const strictTransaction = { - additionalProperties: false, -}; +export function signedSchema(schema: TransactionSchema): TransactionSchema { + const signed = extend(schema, signedTransaction); + signed.$id = `${schema.$id}Signed`; + return signed; +} + +export function strictSchema(schema: TransactionSchema): TransactionSchema { + const signed = signedSchema(schema); + const strict = extend(signed, strictTransaction); + strict.$id = `${schema.$id}Strict`; + return strict; +} export const transfer = extend(transactionBaseSchema, { $id: "transfer", @@ -167,3 +165,5 @@ export const delegateResignation = extend(transactionBaseSchema, { amount: { bignumber: { minimum: 0, maximum: 0 } }, }, }); + +export type TransactionSchema = typeof transactionBaseSchema; diff --git a/tslint.json b/tslint.json index e8563dc1eb..60e2738db8 100644 --- a/tslint.json +++ b/tslint.json @@ -4,6 +4,7 @@ "interface-name": false, "no-console": false, "no-default-export": true, + "no-use-before-declare": true, "no-shadowed-variable": false, "object-literal-sort-keys": false, "radix": false