refactor: move walletKeys.ts to args/

Issue: BTC-1351
BitGo · Sep 26, 2024 · bb2a70d · bb2a70d
1 parent 072e21d
commit bb2a70d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 15 deletions.
diff --git a/modules/utxo-bin/src/args/index.ts b/modules/utxo-bin/src/args/index.ts
@@ -1 +1,2 @@
 export * from './parseString';
+export * from './walletKeys';
diff --git a/modules/utxo-bin/src/walletKeys.ts → modules/utxo-bin/src/args/walletKeys.ts b/modules/utxo-bin/src/walletKeys.ts → modules/utxo-bin/src/args/walletKeys.ts
@@ -5,6 +5,15 @@ export function isWalletKeyName(name: string): name is utxolib.bitgo.KeyName {
   return name === 'user' || name === 'backup' || name === 'bitgo';
 }
 
+export const keyOptions = {
+  userKey: { type: 'string', demandOption: true },
+  userKeyPrefix: { type: 'string', default: '0/0' },
+  backupKey: { type: 'string', demandOption: true },
+  backupKeyPrefix: { type: 'string', default: '0/0' },
+  bitgoKey: { type: 'string', demandOption: true },
+  bitgoKeyPrefix: { type: 'string', default: '0/0' },
+} as const;
+
 export type KeyOptions = {
   userKey: string;
   userKeyPrefix?: string;

diff --git a/modules/utxo-bin/src/commands.ts b/modules/utxo-bin/src/commands.ts
@@ -17,7 +17,7 @@ import { AddressParser } from './AddressParser';
 import { parseUnknown } from './parseUnknown';
 import { getParserTxProperties } from './ParserTx';
 import { ScriptParser } from './ScriptParser';
-import { readStringOptions, argToString, stringToBuffer } from './args';
+import { argToString, KeyOptions, keyOptions, readStringOptions, stringToBuffer } from './args';
 import {
   formatAddressTree,
   formatAddressWithFormatString,
@@ -68,26 +68,14 @@ type ArgsParseScript = {
   script: string;
 };
 
-export type ArgsGenerateAddress = {
+export type ArgsGenerateAddress = KeyOptions & {
   network?: string;
-  userKey: string;
-  backupKey: string;
-  bitgoKey: string;
   chain?: number[];
   format: string;
   index?: string[];
   limit?: number;
 };
 
-const keyOptions = {
-  userKey: { type: 'string', demandOption: true },
-  userKeyPrefix: { type: 'string', default: '0/0' },
-  backupKey: { type: 'string', demandOption: true },
-  backupKeyPrefix: { type: 'string', default: '0/0' },
-  bitgoKey: { type: 'string', demandOption: true },
-  bitgoKeyPrefix: { type: 'string', default: '0/0' },
-} as const;
-
 type FormatStringArgs = {
   format: OutputFormat;
   all: boolean;

diff --git a/modules/utxo-bin/src/generateAddress.ts b/modules/utxo-bin/src/generateAddress.ts
@@ -3,7 +3,7 @@ import * as utxolib from '@bitgo/utxo-lib';
 import { Parser } from './Parser';
 import { parseUnknown } from './parseUnknown';
 import { formatTree } from './format';
-import { KeyOptions, getRootWalletKeys } from './walletKeys';
+import { KeyOptions, getRootWalletKeys } from './args';
 
 function getDefaultChainCodes(): number[] {
   return utxolib.bitgo.chainCodes.filter(