Merge pull request #682 from LiskHQ/680-convert_info_cmd_ts

Update copyright and warranty commands to typescript

package.json

@@ -34,7 +34,7 @@
 		"lint:fix": "npm run lint -- --fix",
 		"test": "if [ -z $JENKINS_HOME ]; then npm run test:local; else npm run test:ci; fi",
 		"test:local": "TS_NODE_PROJECT=./test/tsconfig.json nyc mocha test/{,/**/,/**/**/,/**/**/**/}/*.ts",
-		"test:ci": "NODE_ENV=test nyc --exclude \"**/node_modules/** coverage/**\" mocha test",
+		"test:ci": "npm run test:local",
 		"test:watch": "npm run test:local -- --watch",
 		"test:watch:min": "npm run test:watch -- --reporter=min",
 		"cover": "if [ -z $JENKINS_HOME ]; then npm run cover:local; else npm run cover:ci; fi",
@@ -108,9 +108,9 @@
 		"@liskhq/lisk-cryptography": "2.0.0",
 		"@liskhq/lisk-passphrase": "2.0.0",
 		"@liskhq/lisk-transactions": "2.0.0",
-		"@oclif/command": "1.5.0",
-		"@oclif/config": "1.7.4",
-		"@oclif/errors": "1.2.0",
+		"@oclif/command": "1.5.6",
+		"@oclif/config": "1.9.0",
+		"@oclif/errors": "1.2.2",
 		"@oclif/plugin-help": "2.1.1",
 		"bip39": "2.5.0",
 		"chalk": "2.4.1",
@@ -122,8 +122,8 @@
 		"tslib": "1.9.3"
 	},
 	"devDependencies": {
-		"@oclif/dev-cli": "1.18.0",
-		"@oclif/test": "1.2.0",
+		"@oclif/dev-cli": "1.19.5",
+		"@oclif/test": "1.2.2",
 		"@types/bip39": "2.4.0",
 		"@types/chai": "4.1.5",
 		"@types/chai-as-promised": "7.1.0",
@@ -139,12 +139,13 @@
 		"@types/strip-ansi": "3.0.0",
 		"chai": "4.1.2",
 		"chai-as-promised": "7.1.1",
-		"coveralls": "3.0.0",
+		"coveralls": "3.0.2",
 		"husky": "0.14.3",
 		"lint-staged": "5.0.0",
 		"mocha": "4.0.1",
 		"nyc": "11.3.0",
 		"prettier": "1.9.2",
+		"rxjs-compat": "6.3.3",
 		"sinon": "4.1.2",
 		"sinon-chai": "2.14.0",
 		"source-map-support": "0.5.9",

src/base.ts

@@ -63,8 +63,10 @@ export default abstract class BaseCommand extends Command {
 
 	async init(): Promise<void> {
 		// Typing problem where constructor is not allow as Input<any> but it requires to be the type
-		const { flags } = this.parse((// tslint:disable-next-line no-any
-		this.constructor as unknown) as flagParser.Input<any>);
+		const { flags } = this.parse(
+			// tslint:disable-next-line no-any
+			(this.constructor as unknown) as flagParser.Input<any>,
+		);
 		this.printFlags = flags;
 
 		process.stdout.on('error', handleEPIPE);

src/commands/account/get.ts

@@ -46,9 +46,7 @@ export default class GetCommand extends BaseCommand {
 	async run(): Promise<void> {
 		const { args } = this.parse(GetCommand);
 		const { addresses: addressesStr }: Args = args;
-		const addresses = addressesStr
-			.split(',')
-			.filter(Boolean);
+		const addresses = addressesStr.split(',').filter(Boolean);
 		const req = addresses.map((address: string) => ({
 			query: {
 				limit: 1,

src/commands/copyright.js → src/commands/copyright.ts

@@ -33,17 +33,17 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 `.trim();
 
 export default class CopyrightCommand extends BaseCommand {
-	async run() {
-		this.print({ copyright });
-	}
-}
+	static description = `
+	Displays copyright notice.
+	`;
 
-CopyrightCommand.flags = {
-	...BaseCommand.flags,
-};
+	static examples = ['copyright'];
 
-CopyrightCommand.description = `
-Displays copyright notice.
-`;
+	static flags = {
+		...BaseCommand.flags,
+	};
 
-CopyrightCommand.examples = ['copyright'];
+	async run(): Promise<void> {
+		this.print({ copyright });
+	}
+}

src/commands/delegate/get.ts

@@ -46,7 +46,9 @@ export default class GetCommand extends BaseCommand {
 	async run(): Promise<void> {
 		const { args } = this.parse(GetCommand);
 		const { usernames: usernamesStr }: Args = args;
-		const usernames: ReadonlyArray<string> = usernamesStr.split(',').filter(Boolean);
+		const usernames: ReadonlyArray<string> = usernamesStr
+			.split(',')
+			.filter(Boolean);
 		const req = usernames.map(username => ({
 			query: {
 				limit: 1,

src/commands/delegate/voters.ts

@@ -34,7 +34,11 @@ const DEFAULT_LIMIT = 10;
 const DEFAULT_OFFSET = 0;
 const DEFAULT_SORT = 'balance:desc';
 
-const processFlagInputs = (limitStr: string, offsetStr: string, sortStr: string): QueryParameters => {
+const processFlagInputs = (
+	limitStr: string,
+	offsetStr: string,
+	sortStr: string,
+): QueryParameters => {
 	const limit = parseInt(limitStr, 10);
 	const offset = parseInt(offsetStr, 10);
 	const sort = sortStr ? sortStr.trim() : undefined;

src/commands/node/forging.ts

@@ -30,7 +30,12 @@ interface Args {
 const STATUS_ENABLE = 'enable';
 const STATUS_DISABLE = 'disable';
 
-const processInput = (client: APIClient, status: string, publicKey: string, password?: string) => {
+const processInput = async (
+	client: APIClient,
+	status: string,
+	publicKey: string,
+	password?: string,
+): Promise<unknown> => {
 	if (!password) {
 		throw new ValidationError('No password was provided.');
 	}
@@ -42,8 +47,7 @@ const processInput = (client: APIClient, status: string, publicKey: string, pass
 			forging: status === STATUS_ENABLE,
 		})
 		.then(response => response.data);
-}
-
+};
 
 export default class ForgingCommand extends BaseCommand {
 	static args = [
@@ -75,10 +79,9 @@ export default class ForgingCommand extends BaseCommand {
 	};
 
 	async run(): Promise<void> {
-		const {
-			args,
-			flags: { password: passwordSource },
-		} = this.parse(ForgingCommand);
+		const { args, flags: { password: passwordSource } } = this.parse(
+			ForgingCommand,
+		);
 
 		const { status, publicKey }: Args = args;
 		transactions.utils.validatePublicKey(publicKey);
@@ -94,4 +97,3 @@ export default class ForgingCommand extends BaseCommand {
 		this.print(result);
 	}
 }
-

src/commands/node/get.ts

@@ -62,6 +62,3 @@ export default class GetCommand extends BaseCommand {
 		this.print(fullInfo);
 	}
 }
-
-
-

src/commands/signature/broadcast.ts

@@ -76,4 +76,3 @@ export default class BroadcastCommand extends BaseCommand {
 		this.print(response.data);
 	}
 }
-

src/commands/signature/create.ts

@@ -62,10 +62,9 @@ export default class CreateCommand extends BaseCommand {
 	};
 
 	async run(): Promise<void> {
-		const {
-			args,
-			flags: { passphrase: passphraseSource },
-		} = this.parse(CreateCommand);
+		const { args, flags: { passphrase: passphraseSource } } = this.parse(
+			CreateCommand,
+		);
 
 		const { transaction }: Args = args;
 		const transactionInput = transaction || (await getTransactionInput());
@@ -95,4 +94,4 @@ export default class CreateCommand extends BaseCommand {
 
 		this.print(result);
 	}
-}
+}

src/commands/transaction/broadcast.ts

@@ -64,4 +64,3 @@ export default class BroadcastCommand extends BaseCommand {
 		this.print(response.data);
 	}
 }
-

src/commands/transaction/create.ts

@@ -37,7 +37,11 @@ const typeNumberMap: TypeNumberMap = {
 };
 
 const options = Object.entries(typeNumberMap).reduce(
-	(accumulated: string[], [key, value]: [string, string]) => [...accumulated, key, value],
+	(accumulated: string[], [key, value]: [string, string]) => [
+		...accumulated,
+		key,
+		value,
+	],
 	[],
 );
 
@@ -53,7 +57,10 @@ const typeClassMap: TypeClassMap = {
 	multisignature: MultisignatureCommand,
 };
 
-const resolveFlags = (accumulated: ReadonlyArray<string>, [key, value]: [string, string | boolean | undefined]) => {
+const resolveFlags = (
+	accumulated: ReadonlyArray<string>,
+	[key, value]: [string, string | boolean | undefined],
+): ReadonlyArray<string> => {
 	if (key === 'type') {
 		return accumulated;
 	}
@@ -104,6 +111,3 @@ export default class CreateCommand extends BaseCommand {
 		await typeClassMap[commandType].run([...argv, ...resolvedFlags]);
 	}
 }
-
-
-

src/commands/transaction/create/delegate.ts

@@ -17,13 +17,19 @@ import { registerDelegate } from '@liskhq/lisk-transactions';
 import { flags as flagParser } from '@oclif/command';
 import BaseCommand from '../../../base';
 import { flags as commonFlags } from '../../../utils/flags';
-import { getInputsFromSources, InputFromSourceOutput } from '../../../utils/input';
+import {
+	getInputsFromSources,
+	InputFromSourceOutput,
+} from '../../../utils/input';
 
 interface Args {
 	readonly username: string;
 }
 
-const processInputs = (username: string) => ({ passphrase, secondPassphrase }: InputFromSourceOutput) =>
+const processInputs = (username: string) => ({
+	passphrase,
+	secondPassphrase,
+}: InputFromSourceOutput) =>
 	registerDelegate({
 		passphrase,
 		secondPassphrase,
@@ -90,4 +96,4 @@ export default class DelegateCommand extends BaseCommand {
 		const result = processFunction(inputs);
 		this.print(result);
 	}
-}
+}

src/commands/transaction/create/multisignature.ts

@@ -13,23 +13,30 @@
  * Removal or modification of this copyright notice is prohibited.
  *
  */
-import { registerMultisignature, utils as transactionUtils } from '@liskhq/lisk-transactions';
+import {
+	registerMultisignature,
+	utils as transactionUtils,
+} from '@liskhq/lisk-transactions';
 import { flags as flagParser } from '@oclif/command';
 import BaseCommand from '../../../base';
 import { flags as commonFlags } from '../../../utils/flags';
 import { validateLifetime, validateMinimum } from '../../../utils/helpers';
-import { getInputsFromSources, InputFromSourceOutput } from '../../../utils/input';
+import {
+	getInputsFromSources,
+	InputFromSourceOutput,
+} from '../../../utils/input';
 
 interface Args {
 	readonly keysgroup: string;
 	readonly lifetime: string;
 	readonly minimum: string;
 }
 
-const processInputs = (lifetime: number, minimum: number, keysgroup: ReadonlyArray<string>) => ({
-	passphrase,
-	secondPassphrase,
-}: InputFromSourceOutput) =>
+const processInputs = (
+	lifetime: number,
+	minimum: number,
+	keysgroup: ReadonlyArray<string>,
+) => ({ passphrase, secondPassphrase }: InputFromSourceOutput) =>
 	registerMultisignature({
 		passphrase,
 		secondPassphrase,
@@ -129,4 +136,4 @@ export default class MultisignatureCommand extends BaseCommand {
 		const result = processFunction(inputs);
 		this.print(result);
 	}
-}
+}

src/commands/transaction/create/second-passphrase.ts

@@ -18,9 +18,15 @@ import { flags as flagParser } from '@oclif/command';
 import BaseCommand from '../../../base';
 import { ValidationError } from '../../../utils/error';
 import { flags as commonFlags } from '../../../utils/flags';
-import { getInputsFromSources, InputFromSourceOutput } from '../../../utils/input';
+import {
+	getInputsFromSources,
+	InputFromSourceOutput,
+} from '../../../utils/input';
 
-export const processInputs = () => ({ passphrase, secondPassphrase }: InputFromSourceOutput) => {
+export const processInputs = () => ({
+	passphrase,
+	secondPassphrase,
+}: InputFromSourceOutput) => {
 	if (!secondPassphrase) {
 		throw new ValidationError('No second passphrase was provided.');
 	}
@@ -29,8 +35,7 @@ export const processInputs = () => ({ passphrase, secondPassphrase }: InputFromS
 		passphrase,
 		secondPassphrase,
 	});
-}
-
+};
 
 export default class SecondPassphraseCommand extends BaseCommand {
 	static description = `
@@ -78,4 +83,4 @@ export default class SecondPassphraseCommand extends BaseCommand {
 		const result = processFunction(inputs);
 		this.print(result);
 	}
-}
+}

src/commands/transaction/create/transfer.ts

@@ -17,7 +17,10 @@ import { transfer, utils as transactionUtils } from '@liskhq/lisk-transactions';
 import { flags as flagParser } from '@oclif/command';
 import BaseCommand from '../../../base';
 import { AlphabetLowercase, flags as commonFlags } from '../../../utils/flags';
-import { getInputsFromSources, InputFromSourceOutput } from '../../../utils/input';
+import {
+	getInputsFromSources,
+	InputFromSourceOutput,
+} from '../../../utils/input';
 
 interface Args {
 	readonly address: string;
@@ -62,9 +65,7 @@ export default class TransferCommand extends BaseCommand {
 	Creates a transaction which will transfer the specified amount to an address if broadcast to the network.
 		`;
 
-	static examples = [
-		'transaction:create:transfer 100 13356260975429434553L',
-	];
+	static examples = ['transaction:create:transfer 100 13356260975429434553L'];
 
 	static flags = {
 		...BaseCommand.flags,
@@ -121,4 +122,4 @@ export default class TransferCommand extends BaseCommand {
 		const result = processFunction(inputs);
 		this.print(result);
 	}
-}
+}