Extract common variables as Context

Author: majecty

src/command/create.ts

@@ -1,14 +1,11 @@
-import { CCKey } from "codechain-keystore";
 import * as _ from "lodash";
 
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function createKey(
-    cckey: CCKey,
-    accountType: AccountType,
-    passphrase: string,
-    networkId: string
+    { cckey, accountType, networkId }: Context,
+    passphrase: string
 ): Promise<void> {
     const key = await cckey[accountType].createKey({
         passphrase

src/command/delete.ts

@@ -1,15 +1,12 @@
-import { CCKey } from "codechain-keystore";
 import * as _ from "lodash";
 
 import { CLIError, CLIErrorType } from "../error";
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { findMatchingKey } from "../util";
 
 export async function deleteKey(
-    cckey: CCKey,
-    accountType: AccountType,
-    address: string,
-    networkId: string
+    { cckey, accountType, networkId }: Context,
+    address: string
 ): Promise<void> {
     const keys = await cckey[accountType].getKeys();
     const key = findMatchingKey(accountType, keys, address, networkId);

src/command/export.ts

@@ -1,14 +1,12 @@
-import { CCKey, SecretStorage } from "codechain-keystore";
+import { SecretStorage } from "codechain-keystore";
 
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { findMatchingKey } from "../util";
 
 export async function exportKey(
-    cckey: CCKey,
-    accountType: AccountType,
+    { cckey, accountType, networkId }: Context,
     address: string,
-    passphrase: string,
-    networkId: string
+    passphrase: string
 ): Promise<SecretStorage> {
     const keys = await cckey[accountType].getKeys();
     const key = findMatchingKey(accountType, keys, address, networkId);

src/command/import.ts

@@ -1,15 +1,13 @@
-import { CCKey, SecretStorage } from "codechain-keystore";
+import { SecretStorage } from "codechain-keystore";
 import * as _ from "lodash";
 
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function importKey(
-    cckey: CCKey,
-    accountType: AccountType,
+    { cckey, accountType, networkId }: Context,
     secret: SecretStorage,
-    passphrase: string,
-    networkId: string
+    passphrase: string
 ): Promise<void> {
     const key = await cckey[accountType].importKey({
         secret,

src/command/importRaw.ts

@@ -1,16 +1,13 @@
-import { CCKey } from "codechain-keystore";
 import { PrivateKey } from "codechain-keystore/lib/types";
 import * as _ from "lodash";
 
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
 export async function importRawKey(
-    cckey: CCKey,
-    accountType: AccountType,
+    { cckey, accountType, networkId }: Context,
     privateKey: PrivateKey,
-    passphrase: string,
-    networkId: string
+    passphrase: string
 ): Promise<void> {
     const key = await cckey[accountType].importRaw({
         privateKey,

src/command/list.ts

@@ -1,14 +1,13 @@
-import { CCKey } from "codechain-keystore";
 import * as _ from "lodash";
 
-import { AccountType } from "../types";
+import { Context } from "../types";
 import { getAddressFromKey } from "../util";
 
-export async function listKeys(
-    cckey: CCKey,
-    accountType: AccountType,
-    networkId: string
-): Promise<void> {
+export async function listKeys({
+    cckey,
+    accountType,
+    networkId
+}: Context): Promise<void> {
     let keys = await cckey[accountType].getKeys();
     keys = _.map(keys, key => getAddressFromKey(accountType, key, networkId));
     if (keys.length === 0) {

src/index.ts

@@ -108,23 +108,41 @@ async function listCommand(args: any[], option: ListOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const networkId = option.parent.networkId;
-    await listKeys(cckey, accountType, networkId);
+    await listKeys({
+        cckey,
+        accountType,
+        networkId
+    });
 }
 
 async function createCommand(args: any[], option: CreateOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const passphrase = await parsePassphrase(option.passphrase);
     const networkId = option.parent.networkId;
-    await createKey(cckey, accountType, passphrase, networkId);
+    await createKey(
+        {
+            cckey,
+            accountType,
+            networkId
+        },
+        passphrase
+    );
 }
 
 async function deleteCommand(args: any[], option: DeleteOption) {
     const cckey = await CCKey.create({ dbPath: option.parent.keysPath });
     const accountType = parseAccountType(option.parent.accountType);
     const address = parseAddress(option.address);
     const networkId = option.parent.networkId;
-    await deleteKey(cckey, accountType, address, networkId);
+    await deleteKey(
+        {
+            cckey,
+            accountType,
+            networkId
+        },
+        address
+    );
 }
 
 async function importCommand([path]: any[], option: ImportOption) {
@@ -134,11 +152,13 @@ async function importCommand([path]: any[], option: ImportOption) {
     const contents = fs.readFileSync(path, { encoding: "utf8" });
     const networkId = option.parent.networkId;
     await importKey(
-        cckey,
-        accountType,
+        {
+            cckey,
+            accountType,
+            networkId
+        },
         JSON.parse(contents),
-        passphrase,
-        networkId
+        passphrase
     );
 }
 
@@ -147,7 +167,15 @@ async function importRawCommand([privateKey]: any[], option: ImportOption) {
     const accountType = parseAccountType(option.parent.accountType);
     const passphrase = await parsePassphrase(option.passphrase);
     const networkId = option.parent.networkId;
-    await importRawKey(cckey, accountType, privateKey, passphrase, networkId);
+    await importRawKey(
+        {
+            cckey,
+            accountType,
+            networkId
+        },
+        privateKey,
+        passphrase
+    );
 }
 
 async function exportCommand(args: any[], option: ExportOption) {
@@ -157,11 +185,13 @@ async function exportCommand(args: any[], option: ExportOption) {
     const passphrase = await parsePassphrase(option.passphrase);
     const networkId = option.parent.networkId;
     const secret = await exportKey(
-        cckey,
-        accountType,
+        {
+            cckey,
+            accountType,
+            networkId
+        },
         address,
-        passphrase,
-        networkId
+        passphrase
     );
     const res = option.pretty
         ? JSON.stringify(secret, null, 2)

src/types.ts

@@ -1,3 +1,5 @@
+import { CCKey } from "codechain-keystore";
+
 export type AccountType = "platform" | "asset";
 export type Action = "list" | "create" | "delete";
 
@@ -32,3 +34,9 @@ export interface ExportOption {
     passphrase: string;
     pretty: boolean;
 }
+
+export interface Context {
+    cckey: CCKey;
+    accountType: AccountType;
+    networkId: string;
+}