From 906c249cf13cdd8e5cd195fae743831b0b4a16de Mon Sep 17 00:00:00 2001 From: huof6890 <68298506@qq.com> Date: Thu, 7 Jul 2022 21:56:09 +0800 Subject: [PATCH 1/3] correct Chinese usage message --- ioctl/cmd/account/account.go | 2 +- ioctl/cmd/account/accountimport.go | 2 +- ioctl/cmd/account/accountverify.go | 2 +- ioctl/cmd/hdwallet/hdwallet.go | 2 +- ioctl/cmd/jwt/jwt.go | 2 +- ioctl/newcmd/account/account.go | 2 +- ioctl/newcmd/account/accountcreate.go | 2 +- ioctl/newcmd/account/accountimport.go | 2 +- ioctl/newcmd/account/accountlist.go | 1 + ioctl/newcmd/account/accountverify.go | 2 +- ioctl/newcmd/hdwallet/hdwalletcreate.go | 2 +- ioctl/newcmd/hdwallet/hdwalletdelete.go | 2 +- ioctl/newcmd/hdwallet/hdwalletexport.go | 2 +- ioctl/newcmd/hdwallet/hdwalletimport.go | 2 +- ioctl/newcmd/version/version.go | 2 +- 15 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ioctl/cmd/account/account.go b/ioctl/cmd/account/account.go index 947448f776..393613b6ed 100644 --- a/ioctl/cmd/account/account.go +++ b/ioctl/cmd/account/account.go @@ -43,7 +43,7 @@ var ( } _accountCmdUses = map[config.Language]string{ config.English: "account", - config.Chinese: "账户", + config.Chinese: "account", } _flagEndpoint = map[config.Language]string{ config.English: "set endpoint for once", diff --git a/ioctl/cmd/account/accountimport.go b/ioctl/cmd/account/accountimport.go index 36b7a00065..75ffbf9b36 100644 --- a/ioctl/cmd/account/accountimport.go +++ b/ioctl/cmd/account/accountimport.go @@ -27,7 +27,7 @@ var ( } _importCmdUses = map[config.Language]string{ config.English: "import", - config.Chinese: "导入", + config.Chinese: "import", } _importKeyCmdShorts = map[config.Language]string{ config.English: "Import IoTeX private key into wallet", diff --git a/ioctl/cmd/account/accountverify.go b/ioctl/cmd/account/accountverify.go index f10a526998..db33a688f7 100644 --- a/ioctl/cmd/account/accountverify.go +++ b/ioctl/cmd/account/accountverify.go @@ -25,7 +25,7 @@ var ( } _verifyCmdUses = map[config.Language]string{ config.English: "verify", - config.Chinese: "verify 验证", + config.Chinese: "verify", } ) var ( diff --git a/ioctl/cmd/hdwallet/hdwallet.go b/ioctl/cmd/hdwallet/hdwallet.go index 29115c198a..024a1d4d0c 100644 --- a/ioctl/cmd/hdwallet/hdwallet.go +++ b/ioctl/cmd/hdwallet/hdwallet.go @@ -21,7 +21,7 @@ var ( } _hdwalletCmdUses = map[config.Language]string{ config.English: "hdwallet", - config.Chinese: "钱包", + config.Chinese: "hdwallet", } ) diff --git a/ioctl/cmd/jwt/jwt.go b/ioctl/cmd/jwt/jwt.go index d1ad7ada5f..6da77b05c4 100644 --- a/ioctl/cmd/jwt/jwt.go +++ b/ioctl/cmd/jwt/jwt.go @@ -22,7 +22,7 @@ var ( } _jwtCmdUses = map[config.Language]string{ config.English: "jwt", - config.Chinese: "json网络令牌", + config.Chinese: "jwt", } ) diff --git a/ioctl/newcmd/account/account.go b/ioctl/newcmd/account/account.go index 27057ee02e..304debe705 100644 --- a/ioctl/newcmd/account/account.go +++ b/ioctl/newcmd/account/account.go @@ -42,7 +42,7 @@ var ( } _accountCmdUses = map[config.Language]string{ config.English: "account", - config.Chinese: "账户", + config.Chinese: "account", } ) diff --git a/ioctl/newcmd/account/accountcreate.go b/ioctl/newcmd/account/accountcreate.go index dacca027bd..315984ba6c 100644 --- a/ioctl/newcmd/account/accountcreate.go +++ b/ioctl/newcmd/account/accountcreate.go @@ -27,7 +27,7 @@ var ( } _createUses = map[config.Language]string{ config.English: "create", - config.Chinese: "create 创建", + config.Chinese: "create", } _createFlagUsages = map[config.Language]string{ config.English: "number of accounts to create", diff --git a/ioctl/newcmd/account/accountimport.go b/ioctl/newcmd/account/accountimport.go index 6ab888f562..4e42dbdf32 100644 --- a/ioctl/newcmd/account/accountimport.go +++ b/ioctl/newcmd/account/accountimport.go @@ -27,7 +27,7 @@ var ( } importCmdUses = map[config.Language]string{ config.English: "import", - config.Chinese: "导入", + config.Chinese: "import", } importKeyCmdShorts = map[config.Language]string{ config.English: "Import IoTeX private key into wallet", diff --git a/ioctl/newcmd/account/accountlist.go b/ioctl/newcmd/account/accountlist.go index 77c685e095..16a840cb4d 100644 --- a/ioctl/newcmd/account/accountlist.go +++ b/ioctl/newcmd/account/accountlist.go @@ -25,6 +25,7 @@ var ( } _listCmdUses = map[config.Language]string{ config.English: "list", + config.Chinese: "list", } ) diff --git a/ioctl/newcmd/account/accountverify.go b/ioctl/newcmd/account/accountverify.go index 4e6ece0e01..08a00375d7 100644 --- a/ioctl/newcmd/account/accountverify.go +++ b/ioctl/newcmd/account/accountverify.go @@ -25,7 +25,7 @@ var ( } _verifyCmdUses = map[config.Language]string{ config.English: "verify", - config.Chinese: "verify 验证", + config.Chinese: "verify", } _enterPrivateKey = map[config.Language]string{ config.English: "Enter private key:", diff --git a/ioctl/newcmd/hdwallet/hdwalletcreate.go b/ioctl/newcmd/hdwallet/hdwalletcreate.go index 3c700bd753..4ff1a50ecf 100644 --- a/ioctl/newcmd/hdwallet/hdwalletcreate.go +++ b/ioctl/newcmd/hdwallet/hdwalletcreate.go @@ -23,7 +23,7 @@ var ( } _createByMnemonicCmdUses = map[config.Language]string{ config.English: "create", - config.Chinese: "create 创建", + config.Chinese: "create", } ) diff --git a/ioctl/newcmd/hdwallet/hdwalletdelete.go b/ioctl/newcmd/hdwallet/hdwalletdelete.go index 9af8305571..68a4c63ee7 100644 --- a/ioctl/newcmd/hdwallet/hdwalletdelete.go +++ b/ioctl/newcmd/hdwallet/hdwalletdelete.go @@ -23,7 +23,7 @@ var ( } _hdwalletDeleteCmdUses = map[config.Language]string{ config.English: "delete", - config.Chinese: "delete 删除", + config.Chinese: "delete", } ) diff --git a/ioctl/newcmd/hdwallet/hdwalletexport.go b/ioctl/newcmd/hdwallet/hdwalletexport.go index 2fd6c22b8a..69a94f2fd6 100644 --- a/ioctl/newcmd/hdwallet/hdwalletexport.go +++ b/ioctl/newcmd/hdwallet/hdwalletexport.go @@ -22,7 +22,7 @@ var ( } _hdwalletExportCmdUses = map[config.Language]string{ config.English: "export", - config.Chinese: "export 导出", + config.Chinese: "export", } ) diff --git a/ioctl/newcmd/hdwallet/hdwalletimport.go b/ioctl/newcmd/hdwallet/hdwalletimport.go index 33ed1f08ee..f4ae1e78ea 100644 --- a/ioctl/newcmd/hdwallet/hdwalletimport.go +++ b/ioctl/newcmd/hdwallet/hdwalletimport.go @@ -25,7 +25,7 @@ var ( } _importCmdUses = map[config.Language]string{ config.English: "import", - config.Chinese: "import 导入", + config.Chinese: "import", } ) diff --git a/ioctl/newcmd/version/version.go b/ioctl/newcmd/version/version.go index 5cca59af50..db792e1700 100644 --- a/ioctl/newcmd/version/version.go +++ b/ioctl/newcmd/version/version.go @@ -26,7 +26,7 @@ import ( var ( _uses = map[config.Language]string{ config.English: "version", - config.Chinese: "版本", + config.Chinese: "version", } _shorts = map[config.Language]string{ config.English: "Print the version of ioctl and node", From c6396da68e4ed231cc0b09785d7730e422d1a4af Mon Sep 17 00:00:00 2001 From: huof6890 <68298506@qq.com> Date: Tue, 12 Jul 2022 20:47:16 +0800 Subject: [PATCH 2/3] consistent command usage --- ioctl/cmd/account/account.go | 11 ++++------- ioctl/cmd/account/accountactions.go | 2 +- ioctl/cmd/account/accountcreate.go | 6 +----- ioctl/cmd/account/accountimport.go | 6 +----- ioctl/cmd/account/accountlist.go | 6 +----- ioctl/cmd/account/accountverify.go | 6 +----- ioctl/cmd/action/action.go | 6 +----- ioctl/cmd/action/stake2.go | 6 +----- ioctl/cmd/action/xrc20.go | 6 +----- ioctl/cmd/alias/alias.go | 6 +----- ioctl/cmd/alias/aliasexport.go | 6 +----- ioctl/cmd/alias/aliaslist.go | 6 +----- ioctl/cmd/bc/bc.go | 6 +----- ioctl/cmd/bc/bcinfo.go | 6 +----- ioctl/cmd/contract/contract.go | 6 +----- ioctl/cmd/contract/contractdeploy.go | 6 +----- ioctl/cmd/contract/contractinvoke.go | 6 +----- ioctl/cmd/contract/contractprepare.go | 6 +----- ioctl/cmd/contract/contracttest.go | 6 +----- ioctl/cmd/did/did.go | 6 +----- ioctl/cmd/hdwallet/hdwallet.go | 6 +----- ioctl/cmd/hdwallet/hdwalletcreate.go | 6 +----- ioctl/cmd/hdwallet/hdwalletdelete.go | 6 +----- ioctl/cmd/hdwallet/hdwalletderive.go | 6 +----- ioctl/cmd/hdwallet/hdwalletexport.go | 6 +----- ioctl/cmd/hdwallet/hdwalletimport.go | 6 +----- ioctl/cmd/jwt/jwt.go | 6 +----- ioctl/cmd/node/node.go | 6 +----- ioctl/cmd/root.go | 12 ++---------- ioctl/cmd/version/version.go | 6 +----- ioctl/newcmd/account/account.go | 7 +------ ioctl/newcmd/account/accountcreate.go | 7 +------ ioctl/newcmd/account/accountcreate_test.go | 2 +- ioctl/newcmd/account/accountimport.go | 7 +------ ioctl/newcmd/account/accountlist.go | 7 +------ ioctl/newcmd/account/accountverify.go | 7 +------ ioctl/newcmd/alias/alias.go | 7 +------ ioctl/newcmd/alias/aliasexport.go | 9 +-------- ioctl/newcmd/alias/aliaslist.go | 10 +++------- ioctl/newcmd/alias/aliasremove.go | 7 +------ ioctl/newcmd/bc/bc.go | 7 +------ ioctl/newcmd/bc/bcbucket.go | 4 ++-- ioctl/newcmd/hdwallet/hdwalletcreate.go | 7 +------ ioctl/newcmd/hdwallet/hdwalletdelete.go | 7 +------ ioctl/newcmd/hdwallet/hdwalletderive.go | 7 +------ ioctl/newcmd/hdwallet/hdwalletexport.go | 7 +------ ioctl/newcmd/hdwallet/hdwalletimport.go | 7 +------ ioctl/newcmd/node/node.go | 11 ++--------- ioctl/newcmd/root.go | 14 ++------------ ioctl/newcmd/version/version.go | 7 +------ 50 files changed, 59 insertions(+), 276 deletions(-) diff --git a/ioctl/cmd/account/account.go b/ioctl/cmd/account/account.go index 393613b6ed..31c35a772b 100644 --- a/ioctl/cmd/account/account.go +++ b/ioctl/cmd/account/account.go @@ -26,13 +26,14 @@ import ( "github.com/iotexproject/go-pkgs/crypto" "github.com/iotexproject/go-pkgs/hash" "github.com/iotexproject/iotex-address/address" + "github.com/iotexproject/iotex-proto/golang/iotexapi" + "github.com/iotexproject/iotex-proto/golang/iotextypes" + "github.com/iotexproject/iotex-core/ioctl/cmd/hdwallet" "github.com/iotexproject/iotex-core/ioctl/config" "github.com/iotexproject/iotex-core/ioctl/output" "github.com/iotexproject/iotex-core/ioctl/util" "github.com/iotexproject/iotex-core/ioctl/validator" - "github.com/iotexproject/iotex-proto/golang/iotexapi" - "github.com/iotexproject/iotex-proto/golang/iotextypes" ) // Multi-language support @@ -41,10 +42,6 @@ var ( config.English: "Manage accounts of IoTeX blockchain", config.Chinese: "管理IoTeX区块链上的账号", } - _accountCmdUses = map[config.Language]string{ - config.English: "account", - config.Chinese: "account", - } _flagEndpoint = map[config.Language]string{ config.English: "set endpoint for once", config.Chinese: "一次设置端点", @@ -65,7 +62,7 @@ var CryptoSm2 bool // AccountCmd represents the account command var AccountCmd = &cobra.Command{ - Use: config.TranslateInLang(_accountCmdUses, config.UILanguage), + Use: "account", Short: config.TranslateInLang(_accountCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/account/accountactions.go b/ioctl/cmd/account/accountactions.go index ccd38ea111..fb95a9c4f2 100644 --- a/ioctl/cmd/account/accountactions.go +++ b/ioctl/cmd/account/accountactions.go @@ -47,7 +47,7 @@ var ( } _actionsCmdUses = map[config.Language]string{ config.English: "actions (ALIAS|ADDRESS) [SKIP]", - config.Chinese: "actions (ALIAS|ADDRESS) [SKIP]", + config.Chinese: "actions (别名|地址) [SKIP]", } ) diff --git a/ioctl/cmd/account/accountcreate.go b/ioctl/cmd/account/accountcreate.go index 6397a5a2a3..446c69edd9 100644 --- a/ioctl/cmd/account/accountcreate.go +++ b/ioctl/cmd/account/accountcreate.go @@ -26,10 +26,6 @@ var ( config.English: "Create N new accounts and print them", config.Chinese: "创建 N 个新账户，并打印", } - _createCmdUses = map[config.Language]string{ - config.English: "create", - config.Chinese: "create 创建", - } _flagNumUsages = map[config.Language]string{ config.English: "number of accounts to create", config.Chinese: "指定创建账户的数量", @@ -38,7 +34,7 @@ var ( // _accountCreateCmd represents the account create command var _accountCreateCmd = &cobra.Command{ - Use: config.TranslateInLang(_createCmdUses, config.UILanguage), + Use: "create", Short: config.TranslateInLang(_createCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/account/accountimport.go b/ioctl/cmd/account/accountimport.go index 75ffbf9b36..188fb03ec9 100644 --- a/ioctl/cmd/account/accountimport.go +++ b/ioctl/cmd/account/accountimport.go @@ -25,10 +25,6 @@ var ( config.English: "Import IoTeX private key or keystore into wallet", config.Chinese: "将IoTeX的私钥或私钥库导入钱包", } - _importCmdUses = map[config.Language]string{ - config.English: "import", - config.Chinese: "import", - } _importKeyCmdShorts = map[config.Language]string{ config.English: "Import IoTeX private key into wallet", config.Chinese: "将IoTeX的私钥导入钱包", @@ -57,7 +53,7 @@ var ( var ( // _accountImportCmd represents the account import command _accountImportCmd = &cobra.Command{ - Use: config.TranslateInLang(_importCmdUses, config.UILanguage), + Use: "import", Short: config.TranslateInLang(_importCmdShorts, config.UILanguage), } // _accountImportKeyCmd represents the account import key command diff --git a/ioctl/cmd/account/accountlist.go b/ioctl/cmd/account/accountlist.go index 5cd6c0cd7d..4f3c6124f0 100644 --- a/ioctl/cmd/account/accountlist.go +++ b/ioctl/cmd/account/accountlist.go @@ -26,15 +26,11 @@ var ( config.English: "List existing account for ioctl", config.Chinese: "列出ioctl中已存在的账户", } - _listCmdUses = map[config.Language]string{ - config.English: "list", - config.Chinese: "list", - } ) // _accountListCmd represents the account list command var _accountListCmd = &cobra.Command{ - Use: config.TranslateInLang(_listCmdUses, config.UILanguage), + Use: "list", Short: config.TranslateInLang(_listCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/account/accountverify.go b/ioctl/cmd/account/accountverify.go index db33a688f7..2f1df34150 100644 --- a/ioctl/cmd/account/accountverify.go +++ b/ioctl/cmd/account/accountverify.go @@ -23,15 +23,11 @@ var ( config.English: "Verify IoTeX public key and address by private key", config.Chinese: "用私钥验证IoTeX的公钥和地址", } - _verifyCmdUses = map[config.Language]string{ - config.English: "verify", - config.Chinese: "verify", - } ) var ( // _accountVerifyCmd represents the account verify command _accountVerifyCmd = &cobra.Command{ - Use: config.TranslateInLang(_verifyCmdUses, config.UILanguage), + Use: "verify", Short: config.TranslateInLang(_verifyCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/action/action.go b/ioctl/cmd/action/action.go index 3e9a060fb2..b735a04541 100644 --- a/ioctl/cmd/action/action.go +++ b/ioctl/cmd/action/action.go @@ -39,10 +39,6 @@ var ( config.English: "Manage actions of IoTeX blockchain", config.Chinese: "管理IoTex区块链的行为", // this translation } - _actionCmdUses = map[config.Language]string{ - config.English: "action", - config.Chinese: "action 行为", // this translation - } _flagActionEndPointUsages = map[config.Language]string{ config.English: "set endpoint for once", config.Chinese: "一次设置端点", // this translation @@ -70,7 +66,7 @@ var ( // ActionCmd represents the action command var ActionCmd = &cobra.Command{ - Use: config.TranslateInLang(_actionCmdUses, config.UILanguage), + Use: "action", Short: config.TranslateInLang(_actionCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/action/stake2.go b/ioctl/cmd/action/stake2.go index 4816b8e8b9..4967c70cbf 100644 --- a/ioctl/cmd/action/stake2.go +++ b/ioctl/cmd/action/stake2.go @@ -18,10 +18,6 @@ import ( // Multi-language support var ( - _stake2CmdUses = map[config.Language]string{ - config.English: "stake2", - config.Chinese: "stake2", - } _stake2CmdShorts = map[config.Language]string{ config.English: "Support native staking of IoTeX blockchain", config.Chinese: "支持来自ioctl的本地质押", @@ -44,7 +40,7 @@ var _stake2AutoStake bool //Stake2Cmd represent stake2 command var Stake2Cmd = &cobra.Command{ - Use: config.TranslateInLang(_stake2CmdUses, config.UILanguage), + Use: "stake2", Short: config.TranslateInLang(_stake2CmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/action/xrc20.go b/ioctl/cmd/action/xrc20.go index 92e529a9b6..1718d73e15 100644 --- a/ioctl/cmd/action/xrc20.go +++ b/ioctl/cmd/action/xrc20.go @@ -28,10 +28,6 @@ var ( config.English: "Support ERC20 standard command-line", config.Chinese: "使ioctl命令行支持ERC20标准", } - _xrc20CmdUses = map[config.Language]string{ - config.English: "xrc20", - config.Chinese: "xrc20", - } _flagContractAddressUsages = map[config.Language]string{ config.English: "set contract address", config.Chinese: "设定合约地址", @@ -48,7 +44,7 @@ var ( //Xrc20Cmd represent xrc20 standard command-line var Xrc20Cmd = &cobra.Command{ - Use: config.TranslateInLang(_xrc20CmdUses, config.UILanguage), + Use: "xrc20", Short: config.TranslateInLang(_xrc20CmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/alias/alias.go b/ioctl/cmd/alias/alias.go index 895f179692..6d480f41d0 100644 --- a/ioctl/cmd/alias/alias.go +++ b/ioctl/cmd/alias/alias.go @@ -25,10 +25,6 @@ var ( config.English: "Manage aliases of IoTeX addresses", config.Chinese: "管理IoTeX的地址别名", } - _aliasCmdUses = map[config.Language]string{ - config.English: "alias", - config.Chinese: "alias", - } ) // Errors @@ -53,7 +49,7 @@ type aliases struct { // AliasCmd represents the alias command var AliasCmd = &cobra.Command{ - Use: config.TranslateInLang(_aliasCmdUses, config.UILanguage), + Use: "alias", Short: config.TranslateInLang(_aliasCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/alias/aliasexport.go b/ioctl/cmd/alias/aliasexport.go index 077d8a52ad..ce59d22303 100644 --- a/ioctl/cmd/alias/aliasexport.go +++ b/ioctl/cmd/alias/aliasexport.go @@ -24,10 +24,6 @@ var ( config.English: "Export aliases to either json or yaml format", config.Chinese: "以json或yaml格式导出别名", } - _aliasExportUses = map[config.Language]string{ - config.English: "export", - config.Chinese: "export", - } _flagExportFormatUsages = map[config.Language]string{ config.English: "set format: json/yaml", config.Chinese: "设置格式：json / yaml", @@ -36,7 +32,7 @@ var ( // _aliasExportCmd represents the alias export command var _aliasExportCmd = &cobra.Command{ - Use: config.TranslateInLang(_aliasExportUses, config.UILanguage), + Use: "export", Short: config.TranslateInLang(_exportCmd, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/alias/aliaslist.go b/ioctl/cmd/alias/aliaslist.go index fd8622561a..da992dab2c 100644 --- a/ioctl/cmd/alias/aliaslist.go +++ b/ioctl/cmd/alias/aliaslist.go @@ -23,15 +23,11 @@ var ( config.English: "List aliases", config.Chinese: "列出别名", } - _listCmdUses = map[config.Language]string{ - config.English: "list", - config.Chinese: "list", - } ) // _aliasListCmd represents the alias list command var _aliasListCmd = &cobra.Command{ - Use: config.TranslateInLang(_listCmdUses, config.UILanguage), + Use: "list", Short: config.TranslateInLang(_listCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), Run: func(cmd *cobra.Command, args []string) { diff --git a/ioctl/cmd/bc/bc.go b/ioctl/cmd/bc/bc.go index ae3448f539..93d4579f08 100644 --- a/ioctl/cmd/bc/bc.go +++ b/ioctl/cmd/bc/bc.go @@ -30,10 +30,6 @@ var ( config.English: "Deal with block chain of IoTeX blockchain", config.Chinese: "处理IoTeX区块链上的区块", } - _bcCmdUses = map[config.Language]string{ - config.English: "bc", - config.Chinese: "bc", - } _flagEndpointUsages = map[config.Language]string{ config.English: "set endpoint for once", config.Chinese: "一次设置端点", @@ -46,7 +42,7 @@ var ( // BCCmd represents the bc(block chain) command var BCCmd = &cobra.Command{ - Use: config.TranslateInLang(_bcCmdUses, config.UILanguage), + Use: "bc", Short: config.TranslateInLang(_bcCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/bc/bcinfo.go b/ioctl/cmd/bc/bcinfo.go index 290d11f1ff..158dbbfbd3 100644 --- a/ioctl/cmd/bc/bcinfo.go +++ b/ioctl/cmd/bc/bcinfo.go @@ -23,15 +23,11 @@ var ( config.English: "Get current blockchain information", config.Chinese: "获取当前区块链信息", } - _bcInfoCmdUses = map[config.Language]string{ - config.English: "info", - config.Chinese: "info", - } ) // _bcInfoCmd represents the bc info command var _bcInfoCmd = &cobra.Command{ - Use: config.TranslateInLang(_bcInfoCmdUses, config.UILanguage), + Use: "info", Short: config.TranslateInLang(_bcInfoCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/contract/contract.go b/ioctl/cmd/contract/contract.go index 7fdd31feea..17f042f85c 100644 --- a/ioctl/cmd/contract/contract.go +++ b/ioctl/cmd/contract/contract.go @@ -31,10 +31,6 @@ var ( // Multi-language support var ( - _contractCmdUses = map[config.Language]string{ - config.English: "contract", - config.Chinese: "contract", - } _contractCmdShorts = map[config.Language]string{ config.English: "Deal with smart contract of IoTeX blockchain", config.Chinese: "处理IoTeX区块链的智能合约", @@ -55,7 +51,7 @@ var ( // ContractCmd represents the contract command var ContractCmd = &cobra.Command{ - Use: config.TranslateInLang(_contractCmdUses, config.UILanguage), + Use: "contract", Short: config.TranslateInLang(_contractCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/contract/contractdeploy.go b/ioctl/cmd/contract/contractdeploy.go index a1dda15871..63997428fa 100644 --- a/ioctl/cmd/contract/contractdeploy.go +++ b/ioctl/cmd/contract/contractdeploy.go @@ -15,10 +15,6 @@ import ( // Multi-language support var ( - _deployCmdUses = map[config.Language]string{ - config.English: "deploy", - config.Chinese: "deploy", - } _deployCmdShorts = map[config.Language]string{ config.English: "Deploy smart contract of IoTeX blockchain", config.Chinese: "在IoTeX区块链部署智能合约", @@ -27,7 +23,7 @@ var ( // _contractDeployCmd represents the contract deploy command var _contractDeployCmd = &cobra.Command{ - Use: config.TranslateInLang(_deployCmdUses, config.UILanguage), + Use: "deploy", Short: config.TranslateInLang(_deployCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/contract/contractinvoke.go b/ioctl/cmd/contract/contractinvoke.go index 99bb80b830..970e9c82db 100644 --- a/ioctl/cmd/contract/contractinvoke.go +++ b/ioctl/cmd/contract/contractinvoke.go @@ -15,10 +15,6 @@ import ( // Multi-language support var ( - _invokeCmdUses = map[config.Language]string{ - config.English: "invoke", - config.Chinese: "invoke", - } _invokeCmdShorts = map[config.Language]string{ config.English: "Invoke smart contract on IoTeX blockchain", config.Chinese: "调用IoTeX区块链上的智能合约", @@ -27,7 +23,7 @@ var ( // _contractInvokeCmd represents the contract invoke command var _contractInvokeCmd = &cobra.Command{ - Use: config.TranslateInLang(_invokeCmdUses, config.UILanguage), + Use: "invoke", Short: config.TranslateInLang(_invokeCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/contract/contractprepare.go b/ioctl/cmd/contract/contractprepare.go index b3b249d2d8..0830eb80dc 100644 --- a/ioctl/cmd/contract/contractprepare.go +++ b/ioctl/cmd/contract/contractprepare.go @@ -19,10 +19,6 @@ import ( // Multi-language support var ( - _prepareCmdUses = map[config.Language]string{ - config.English: "prepare", - config.Chinese: "prepare", - } _prepareCmdShorts = map[config.Language]string{ config.English: "Prepare solidity compiler", config.Chinese: "准备solidity编译器", @@ -31,7 +27,7 @@ var ( // ContractPrepareCmd represents the contract prepare command var ContractPrepareCmd = &cobra.Command{ - Use: config.TranslateInLang(_prepareCmdUses, config.UILanguage), + Use: "prepare", Short: config.TranslateInLang(_prepareCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/contract/contracttest.go b/ioctl/cmd/contract/contracttest.go index 2979a544c6..e79ef8cf51 100644 --- a/ioctl/cmd/contract/contracttest.go +++ b/ioctl/cmd/contract/contracttest.go @@ -15,10 +15,6 @@ import ( // Multi-language support var ( - _testCmdUses = map[config.Language]string{ - config.English: "test", - config.Chinese: "test", - } _testCmdShorts = map[config.Language]string{ config.English: "Test smart contract of IoTeX blockchain", config.Chinese: "测试IoTeX区块链部署智能合约", @@ -27,7 +23,7 @@ var ( // contractTesCmd represents the contract test command var _contractTestCmd = &cobra.Command{ - Use: config.TranslateInLang(_testCmdUses, config.UILanguage), + Use: "test", Short: config.TranslateInLang(_testCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/did/did.go b/ioctl/cmd/did/did.go index 2cecd24278..1c3897aa9d 100644 --- a/ioctl/cmd/did/did.go +++ b/ioctl/cmd/did/did.go @@ -18,10 +18,6 @@ var ( config.English: "DID command", config.Chinese: "DID command", } - DIDCmdUses = map[config.Language]string{ - config.English: "did command", - config.Chinese: "did command", - } _flagEndpoint = map[config.Language]string{ config.English: "set endpoint for once", config.Chinese: "一次设置端点", @@ -34,7 +30,7 @@ var ( // DIDCmd represents the DID command var DIDCmd = &cobra.Command{ - Use: config.TranslateInLang(DIDCmdUses, config.UILanguage), + Use: "did", Short: config.TranslateInLang(DIDCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/hdwallet/hdwallet.go b/ioctl/cmd/hdwallet/hdwallet.go index 024a1d4d0c..43902cc6d7 100644 --- a/ioctl/cmd/hdwallet/hdwallet.go +++ b/ioctl/cmd/hdwallet/hdwallet.go @@ -19,10 +19,6 @@ var ( config.English: "Manage hdwallets of IoTeX blockchain", config.Chinese: "管理IoTeX区块链上的钱包", } - _hdwalletCmdUses = map[config.Language]string{ - config.English: "hdwallet", - config.Chinese: "hdwallet", - } ) // Errors @@ -32,7 +28,7 @@ var ( // HdwalletCmd represents the hdwallet command var HdwalletCmd = &cobra.Command{ - Use: config.TranslateInLang(_hdwalletCmdUses, config.UILanguage), + Use: "hdwallet", Short: config.TranslateInLang(_hdwalletCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/hdwallet/hdwalletcreate.go b/ioctl/cmd/hdwallet/hdwalletcreate.go index d3600f0c31..c75d17376d 100644 --- a/ioctl/cmd/hdwallet/hdwalletcreate.go +++ b/ioctl/cmd/hdwallet/hdwalletcreate.go @@ -25,15 +25,11 @@ var ( config.English: "create hdwallet using mnemonic", config.Chinese: "通过助记词创建新钱包", } - _createByMnemonicCmdUses = map[config.Language]string{ - config.English: "create", - config.Chinese: "create 创建", - } ) // _hdwalletCreateCmd represents the hdwallet create command var _hdwalletCreateCmd = &cobra.Command{ - Use: config.TranslateInLang(_createByMnemonicCmdUses, config.UILanguage), + Use: "create", Short: config.TranslateInLang(_createByMnemonicCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/hdwallet/hdwalletdelete.go b/ioctl/cmd/hdwallet/hdwalletdelete.go index 5309a580c2..260c253798 100644 --- a/ioctl/cmd/hdwallet/hdwalletdelete.go +++ b/ioctl/cmd/hdwallet/hdwalletdelete.go @@ -23,15 +23,11 @@ var ( config.English: "delete hdwallet", config.Chinese: "删除钱包", } - _hdwalletDeleteCmdUses = map[config.Language]string{ - config.English: "delete", - config.Chinese: "delete 删除", - } ) // _hdwalletDeleteCmd represents the hdwallet delete command var _hdwalletDeleteCmd = &cobra.Command{ - Use: config.TranslateInLang(_hdwalletDeleteCmdUses, config.UILanguage), + Use: "delete", Short: config.TranslateInLang(_hdwalletDeleteCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/hdwallet/hdwalletderive.go b/ioctl/cmd/hdwallet/hdwalletderive.go index 75f5f749b2..44d0ec23c3 100644 --- a/ioctl/cmd/hdwallet/hdwalletderive.go +++ b/ioctl/cmd/hdwallet/hdwalletderive.go @@ -28,15 +28,11 @@ var ( config.English: "derive key from HDWallet", config.Chinese: "查询HDWallet钱包的派生key地址", } - _hdwalletDeriveCmdUses = map[config.Language]string{ - config.English: "derive id1/id2/id3", - config.Chinese: "derive id1/id2/id3", - } ) // _hdwalletDeriveCmd represents the hdwallet derive command var _hdwalletDeriveCmd = &cobra.Command{ - Use: config.TranslateInLang(_hdwalletDeriveCmdUses, config.UILanguage), + Use: "derive id1/id2/id3", Short: config.TranslateInLang(_hdwalletDeriveCmdShorts, config.UILanguage), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/hdwallet/hdwalletexport.go b/ioctl/cmd/hdwallet/hdwalletexport.go index 82423498cd..d9d27518a5 100644 --- a/ioctl/cmd/hdwallet/hdwalletexport.go +++ b/ioctl/cmd/hdwallet/hdwalletexport.go @@ -25,15 +25,11 @@ var ( config.English: "export hdwallet mnemonic using password", config.Chinese: "通过密码导出钱包助记词", } - _hdwalletExportCmdUses = map[config.Language]string{ - config.English: "export", - config.Chinese: "export 导出", - } ) // _hdwalletExportCmd represents the hdwallet export command var _hdwalletExportCmd = &cobra.Command{ - Use: config.TranslateInLang(_hdwalletExportCmdUses, config.UILanguage), + Use: "export", Short: config.TranslateInLang(_hdwalletExportCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/hdwallet/hdwalletimport.go b/ioctl/cmd/hdwallet/hdwalletimport.go index d44baf30dd..d6abeb024c 100644 --- a/ioctl/cmd/hdwallet/hdwalletimport.go +++ b/ioctl/cmd/hdwallet/hdwalletimport.go @@ -28,15 +28,11 @@ var ( config.English: "import hdwallet using mnemonic", config.Chinese: "通过助记词导入钱包", } - _importCmdUses = map[config.Language]string{ - config.English: "import", - config.Chinese: "import 导入", - } ) // _hdwalletImportCmd represents the hdwallet import command var _hdwalletImportCmd = &cobra.Command{ - Use: config.TranslateInLang(_importCmdUses, config.UILanguage), + Use: "import", Short: config.TranslateInLang(_importCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/cmd/jwt/jwt.go b/ioctl/cmd/jwt/jwt.go index 6da77b05c4..790d26ee12 100644 --- a/ioctl/cmd/jwt/jwt.go +++ b/ioctl/cmd/jwt/jwt.go @@ -20,15 +20,11 @@ var ( config.English: "Manage Json Web Token on IoTeX blockchain", config.Chinese: "管理IoTeX区块链上的JWT", } - _jwtCmdUses = map[config.Language]string{ - config.English: "jwt", - config.Chinese: "jwt", - } ) // JwtCmd represents the jwt command var JwtCmd = &cobra.Command{ - Use: config.TranslateInLang(_jwtCmdUses, config.UILanguage), + Use: "jwt", Short: config.TranslateInLang(_jwtCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/node/node.go b/ioctl/cmd/node/node.go index e6fc9335a5..9654559cdc 100644 --- a/ioctl/cmd/node/node.go +++ b/ioctl/cmd/node/node.go @@ -15,10 +15,6 @@ import ( // Multi-language support var ( - _nodeCmdUses = map[config.Language]string{ - config.English: "node", - config.Chinese: "node", - } _nodeCmdShorts = map[config.Language]string{ config.English: "Deal with nodes of IoTeX blockchain", config.Chinese: "处理IoTeX区块链的节点", @@ -36,7 +32,7 @@ var ( // NodeCmd represents the node command var NodeCmd = &cobra.Command{ - Use: config.TranslateInLang(_nodeCmdUses, config.UILanguage), + Use: "node", Short: config.TranslateInLang(_nodeCmdShorts, config.UILanguage), } diff --git a/ioctl/cmd/root.go b/ioctl/cmd/root.go index fc077fea9f..979dac1477 100644 --- a/ioctl/cmd/root.go +++ b/ioctl/cmd/root.go @@ -34,10 +34,6 @@ var ( config.English: `ioctl is a command-line interface for interacting with IoTeX blockchain.`, config.Chinese: `ioctl 是用于与IoTeX区块链进行交互的命令行工具`, } - _ioctlRootCmdUses = map[config.Language]string{ - config.English: "ioctl", - config.Chinese: "ioctl", - } _xctlRootCmdShorts = map[config.Language]string{ config.English: "Command-line interface for consortium blockchain", config.Chinese: "联盟链命令行工具", @@ -46,10 +42,6 @@ var ( config.English: `xctl is a command-line interface for interacting with consortium blockchain.`, config.Chinese: `xctl 是用于与联盟链进行交互的命令行工具`, } - _xctlRootCmdUses = map[config.Language]string{ - config.English: "xctl", - config.Chinese: "xctl", - } _flagOutputFormatUsages = map[config.Language]string{ config.English: "output format", config.Chinese: "指定输出格式", @@ -59,7 +51,7 @@ var ( // NewIoctl returns ioctl root cmd func NewIoctl() *cobra.Command { var rootCmd = &cobra.Command{ - Use: config.TranslateInLang(_ioctlRootCmdUses, config.UILanguage), + Use: "ioctl", Short: config.TranslateInLang(_ioctlRootCmdShorts, config.UILanguage), Long: config.TranslateInLang(_ioctlRootCmdLongs, config.UILanguage), } @@ -87,7 +79,7 @@ func NewIoctl() *cobra.Command { // NewXctl returns xctl root cmd func NewXctl() *cobra.Command { var rootCmd = &cobra.Command{ - Use: config.TranslateInLang(_xctlRootCmdUses, config.UILanguage), + Use: "xctl", Short: config.TranslateInLang(_xctlRootCmdShorts, config.UILanguage), Long: config.TranslateInLang(_xctlRootCmdLongs, config.UILanguage), } diff --git a/ioctl/cmd/version/version.go b/ioctl/cmd/version/version.go index 48fda06781..4e411bd81a 100644 --- a/ioctl/cmd/version/version.go +++ b/ioctl/cmd/version/version.go @@ -24,10 +24,6 @@ import ( // Multi-language support var ( - _versionCmdUses = map[config.Language]string{ - config.English: "version", - config.Chinese: "version", - } _versionCmdShorts = map[config.Language]string{ config.English: "Print the version of ioctl and node", config.Chinese: "打印ioctl和节点的版本", @@ -44,7 +40,7 @@ var ( // VersionCmd represents the version command var VersionCmd = &cobra.Command{ - Use: config.TranslateInLang(_versionCmdUses, config.UILanguage), + Use: "version", Short: config.TranslateInLang(_versionCmdShorts, config.UILanguage), Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/account/account.go b/ioctl/newcmd/account/account.go index 304debe705..2a8716dd40 100644 --- a/ioctl/newcmd/account/account.go +++ b/ioctl/newcmd/account/account.go @@ -40,10 +40,6 @@ var ( config.English: "Manage accounts of IoTeX blockchain", config.Chinese: "管理IoTeX区块链上的账号", } - _accountCmdUses = map[config.Language]string{ - config.English: "account", - config.Chinese: "account", - } ) // Errors @@ -54,11 +50,10 @@ var ( // NewAccountCmd represents the account command func NewAccountCmd(client ioctl.Client) *cobra.Command { - accountUses, _ := client.SelectTranslation(_accountCmdUses) accountShorts, _ := client.SelectTranslation(_accountCmdShorts) ac := &cobra.Command{ - Use: accountUses, + Use: "account", Short: accountShorts, } ac.AddCommand(NewAccountCreate(client)) diff --git a/ioctl/newcmd/account/accountcreate.go b/ioctl/newcmd/account/accountcreate.go index 315984ba6c..97ef3be0bd 100644 --- a/ioctl/newcmd/account/accountcreate.go +++ b/ioctl/newcmd/account/accountcreate.go @@ -25,10 +25,6 @@ var ( config.English: "Create N new accounts and print them", config.Chinese: "创建 N 个新账户，并打印", } - _createUses = map[config.Language]string{ - config.English: "create", - config.Chinese: "create", - } _createFlagUsages = map[config.Language]string{ config.English: "number of accounts to create", config.Chinese: "指定创建账户的数量", @@ -50,7 +46,6 @@ var ( // NewAccountCreate represents the account create command func NewAccountCreate(client ioctl.Client) *cobra.Command { var numAccounts uint - use, _ := client.SelectTranslation(_createUses) short, _ := client.SelectTranslation(_createShorts) usage, _ := client.SelectTranslation(_createFlagUsages) _failToGenerateNewPrivateKey, _ := client.SelectTranslation(_failToGenerateNewPrivateKey) @@ -58,7 +53,7 @@ func NewAccountCreate(client ioctl.Client) *cobra.Command { _failToConvertPublicKeyIntoAddress, _ := client.SelectTranslation(_failToConvertPublicKeyIntoAddress) cmd := &cobra.Command{ - Use: use, + Use: "create", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/account/accountcreate_test.go b/ioctl/newcmd/account/accountcreate_test.go index 41a2bad1c0..d985cf06b9 100644 --- a/ioctl/newcmd/account/accountcreate_test.go +++ b/ioctl/newcmd/account/accountcreate_test.go @@ -22,7 +22,7 @@ func TestNewAccountCreate(t *testing.T) { defer ctrl.Finish() client := mock_ioctlclient.NewMockClient(ctrl) client.EXPECT().SelectTranslation(gomock.Any()).Return("mockTranslationString", - config.English).Times(12) + config.English).Times(10) t.Run("CryptoSm2 is false", func(t *testing.T) { client.EXPECT().IsCryptoSm2().Return(false).Times(1) diff --git a/ioctl/newcmd/account/accountimport.go b/ioctl/newcmd/account/accountimport.go index 4e42dbdf32..8d7a6745fd 100644 --- a/ioctl/newcmd/account/accountimport.go +++ b/ioctl/newcmd/account/accountimport.go @@ -25,10 +25,6 @@ var ( config.English: "Import IoTeX private key or keystore into wallet", config.Chinese: "将IoTeX的私钥或私钥库导入钱包", } - importCmdUses = map[config.Language]string{ - config.English: "import", - config.Chinese: "import", - } importKeyCmdShorts = map[config.Language]string{ config.English: "Import IoTeX private key into wallet", config.Chinese: "将IoTeX的私钥导入钱包", @@ -57,10 +53,9 @@ var ( // NewAccountImportCmd combines three account import command func NewAccountImportCmd(client ioctl.Client) *cobra.Command { - importUses, _ := client.SelectTranslation(importCmdUses) importShorts, _ := client.SelectTranslation(importCmdShorts) accountImportCmd := &cobra.Command{ - Use: importUses, + Use: "import", Short: importShorts, } diff --git a/ioctl/newcmd/account/accountlist.go b/ioctl/newcmd/account/accountlist.go index 16a840cb4d..baa43f51a4 100644 --- a/ioctl/newcmd/account/accountlist.go +++ b/ioctl/newcmd/account/accountlist.go @@ -23,19 +23,14 @@ var ( config.English: "List existing account for ioctl", config.Chinese: "列出ioctl中已存在的账户", } - _listCmdUses = map[config.Language]string{ - config.English: "list", - config.Chinese: "list", - } ) // NewAccountList represents the account list command func NewAccountList(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_listCmdUses) short, _ := client.SelectTranslation(_listCmdShorts) return &cobra.Command{ - Use: use, + Use: "list", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/account/accountverify.go b/ioctl/newcmd/account/accountverify.go index 08a00375d7..d611a89dc5 100644 --- a/ioctl/newcmd/account/accountverify.go +++ b/ioctl/newcmd/account/accountverify.go @@ -23,10 +23,6 @@ var ( config.English: "Verify IoTeX public key and address by private key", config.Chinese: "用私钥验证IoTeX的公钥和地址", } - _verifyCmdUses = map[config.Language]string{ - config.English: "verify", - config.Chinese: "verify", - } _enterPrivateKey = map[config.Language]string{ config.English: "Enter private key:", config.Chinese: "输入私钥:", @@ -43,7 +39,6 @@ var ( // NewAccountVerify represents the account verify command func NewAccountVerify(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_verifyCmdUses) short, _ := client.SelectTranslation(_verifyCmdShorts) _enterPrivateKey, _ := client.SelectTranslation(_enterPrivateKey) _failToGetPrivateKey, _ := client.SelectTranslation(_failToGetPrivateKey) @@ -51,7 +46,7 @@ func NewAccountVerify(client ioctl.Client) *cobra.Command { _failToCovertHexStringToPrivateKey, _ := client.SelectTranslation(_failToCovertHexStringToPrivateKey) return &cobra.Command{ - Use: use, + Use: "verify", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/alias/alias.go b/ioctl/newcmd/alias/alias.go index 103c14ed21..b2023c4d7c 100644 --- a/ioctl/newcmd/alias/alias.go +++ b/ioctl/newcmd/alias/alias.go @@ -23,19 +23,14 @@ var ( config.English: "Manage aliases of IoTeX addresses", config.Chinese: "管理IoTeX的地址别名", } - _aliasCmdUses = map[config.Language]string{ - config.English: "alias", - config.Chinese: "alias", - } ) // NewAliasCmd represents the alias command func NewAliasCmd(client ioctl.Client) *cobra.Command { aliasShorts, _ := client.SelectTranslation(_aliasCmdShorts) - aliasUses, _ := client.SelectTranslation(_aliasCmdUses) ac := &cobra.Command{ - Use: aliasUses, + Use: "alias", Short: aliasShorts, } diff --git a/ioctl/newcmd/alias/aliasexport.go b/ioctl/newcmd/alias/aliasexport.go index e12b506d18..c1a4c77781 100644 --- a/ioctl/newcmd/alias/aliasexport.go +++ b/ioctl/newcmd/alias/aliasexport.go @@ -23,10 +23,6 @@ var ( config.English: "Export aliases to either json or yaml format", config.Chinese: "以json或yaml格式导出别名", } - _uses = map[config.Language]string{ - config.English: "export", - config.Chinese: "export", - } _flagUsages = map[config.Language]string{ config.English: "set format: json/yaml", config.Chinese: "设置格式：json / yaml", @@ -40,13 +36,11 @@ var ( // NewAliasExport represents the alias export command func NewAliasExport(c ioctl.Client) *cobra.Command { var format string - - use, _ := c.SelectTranslation(_uses) short, _ := c.SelectTranslation(_shorts) flagUsage, _ := c.SelectTranslation(_flagUsages) _invalidFlag, _ := c.SelectTranslation(_invalidFlag) ec := &cobra.Command{ - Use: use, + Use: "export", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { @@ -81,7 +75,6 @@ func NewAliasExport(c ioctl.Client) *cobra.Command { "format", "f", "json", flagUsage) return ec - } type aliases struct { diff --git a/ioctl/newcmd/alias/aliaslist.go b/ioctl/newcmd/alias/aliaslist.go index abf232f2ad..e8c4ba5932 100644 --- a/ioctl/newcmd/alias/aliaslist.go +++ b/ioctl/newcmd/alias/aliaslist.go @@ -11,9 +11,10 @@ import ( "sort" "strings" + "github.com/spf13/cobra" + "github.com/iotexproject/iotex-core/ioctl" "github.com/iotexproject/iotex-core/ioctl/config" - "github.com/spf13/cobra" ) // Multi-language support @@ -22,18 +23,13 @@ var ( config.English: "list all alias", config.Chinese: "列出全部别名", } - _listUses = map[config.Language]string{ - config.English: "list", - config.Chinese: "list", - } ) // NewAliasListCmd represents the alias list command func NewAliasListCmd(c ioctl.Client) *cobra.Command { - use, _ := c.SelectTranslation(_listUses) short, _ := c.SelectTranslation(_listShorts) return &cobra.Command{ - Use: use, + Use: "list", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/alias/aliasremove.go b/ioctl/newcmd/alias/aliasremove.go index ebef26a426..2d64e81fc6 100644 --- a/ioctl/newcmd/alias/aliasremove.go +++ b/ioctl/newcmd/alias/aliasremove.go @@ -22,10 +22,6 @@ var ( config.English: "Remove alias", config.Chinese: "移除别名", } - _removeUses = map[config.Language]string{ - config.English: "remove", - config.Chinese: "remove", - } _removeInvalidAlias = map[config.Language]string{ config.English: "invalid alias %s", config.Chinese: "不可用别名 %s", @@ -42,14 +38,13 @@ var ( // NewAliasRemove represents the removes alias command func NewAliasRemove(c ioctl.Client) *cobra.Command { - use, _ := c.SelectTranslation(_removeUses) short, _ := c.SelectTranslation(_removeShorts) invalidAlias, _ := c.SelectTranslation(_removeInvalidAlias) writeError, _ := c.SelectTranslation(_removeWriteError) result, _ := c.SelectTranslation(_removeResult) ec := &cobra.Command{ - Use: use, + Use: "remove", Short: short, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/bc/bc.go b/ioctl/newcmd/bc/bc.go index dcbbe8a10f..f0dcda456d 100644 --- a/ioctl/newcmd/bc/bc.go +++ b/ioctl/newcmd/bc/bc.go @@ -30,19 +30,14 @@ var ( config.English: "Deal with blockchain of IoTeX blockchain", config.Chinese: "处理IoTeX区块链上的区块", } - _bcCmdUses = map[config.Language]string{ - config.English: "bc", - config.Chinese: "bc", - } ) // NewBCCmd represents the bc(block chain) command func NewBCCmd(client ioctl.Client) *cobra.Command { bcShorts, _ := client.SelectTranslation(_bcCmdShorts) - bcUses, _ := client.SelectTranslation(_bcCmdUses) bc := &cobra.Command{ - Use: bcUses, + Use: "bc", Short: bcShorts, } bc.AddCommand(NewBCInfoCmd(client)) diff --git a/ioctl/newcmd/bc/bcbucket.go b/ioctl/newcmd/bc/bcbucket.go index 1a6ad997b0..858a445f63 100644 --- a/ioctl/newcmd/bc/bcbucket.go +++ b/ioctl/newcmd/bc/bcbucket.go @@ -66,8 +66,8 @@ type bucket struct { // NewBCBucketCmd represents the bc Bucket command func NewBCBucketCmd(client ioctl.Client) *cobra.Command { - bcBucketUses, _ := client.SelectTranslation(_bcBlockCmdUses) - bcBucketCmdShorts, _ := client.SelectTranslation(_bcBlockCmdShorts) + bcBucketUses, _ := client.SelectTranslation(_bcBucketUses) + bcBucketCmdShorts, _ := client.SelectTranslation(_bcBucketCmdShorts) bcBucketCmdExample, _ := client.SelectTranslation(_bcBucketCmdExample) return &cobra.Command{ diff --git a/ioctl/newcmd/hdwallet/hdwalletcreate.go b/ioctl/newcmd/hdwallet/hdwalletcreate.go index 4ff1a50ecf..7c214c860a 100644 --- a/ioctl/newcmd/hdwallet/hdwalletcreate.go +++ b/ioctl/newcmd/hdwallet/hdwalletcreate.go @@ -21,19 +21,14 @@ var ( config.English: "create hdwallet using mnemonic", config.Chinese: "通过助记词创建新钱包", } - _createByMnemonicCmdUses = map[config.Language]string{ - config.English: "create", - config.Chinese: "create", - } ) // NewHdwalletCreateCmd represents the hdwallet create command func NewHdwalletCreateCmd(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_createByMnemonicCmdUses) short, _ := client.SelectTranslation(_createByMnemonicCmdShorts) return &cobra.Command{ - Use: use, + Use: "create", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/hdwallet/hdwalletdelete.go b/ioctl/newcmd/hdwallet/hdwalletdelete.go index 68a4c63ee7..7eeead1676 100644 --- a/ioctl/newcmd/hdwallet/hdwalletdelete.go +++ b/ioctl/newcmd/hdwallet/hdwalletdelete.go @@ -21,19 +21,14 @@ var ( config.English: "delete hdwallet", config.Chinese: "删除钱包", } - _hdwalletDeleteCmdUses = map[config.Language]string{ - config.English: "delete", - config.Chinese: "delete", - } ) // NewHdwalletDeleteCmd represents the hdwallet delete command func NewHdwalletDeleteCmd(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_hdwalletDeleteCmdUses) short, _ := client.SelectTranslation(_hdwalletDeleteCmdShorts) return &cobra.Command{ - Use: use, + Use: "delete", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/hdwallet/hdwalletderive.go b/ioctl/newcmd/hdwallet/hdwalletderive.go index c60ab6faf6..f36ba8ab08 100644 --- a/ioctl/newcmd/hdwallet/hdwalletderive.go +++ b/ioctl/newcmd/hdwallet/hdwalletderive.go @@ -22,10 +22,6 @@ import ( // Multi-language support var ( - _hdwalletDeriveCmdUses = map[config.Language]string{ - config.English: "derive id1/id2/id3", - config.Chinese: "derive id1/id2/id3", - } _hdwalletDeriveCmdShorts = map[config.Language]string{ config.English: "derive key from HDWallet", config.Chinese: "查询HDWallet钱包的派生key地址", @@ -34,11 +30,10 @@ var ( // NewHdwalletDeriveCmd represents the hdwallet derive command func NewHdwalletDeriveCmd(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_hdwalletDeriveCmdUses) short, _ := client.SelectTranslation(_hdwalletDeriveCmdShorts) return &cobra.Command{ - Use: use, + Use: "derive id1/id2/id3", Short: short, Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/hdwallet/hdwalletexport.go b/ioctl/newcmd/hdwallet/hdwalletexport.go index 69a94f2fd6..cd226231c8 100644 --- a/ioctl/newcmd/hdwallet/hdwalletexport.go +++ b/ioctl/newcmd/hdwallet/hdwalletexport.go @@ -20,19 +20,14 @@ var ( config.English: "export hdwallet mnemonic using password", config.Chinese: "通过密码导出钱包助记词", } - _hdwalletExportCmdUses = map[config.Language]string{ - config.English: "export", - config.Chinese: "export", - } ) // NewHdwalletExportCmd represents the hdwallet export command func NewHdwalletExportCmd(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_hdwalletExportCmdUses) short, _ := client.SelectTranslation(_hdwalletExportCmdShorts) return &cobra.Command{ - Use: use, + Use: "export", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/hdwallet/hdwalletimport.go b/ioctl/newcmd/hdwallet/hdwalletimport.go index f4ae1e78ea..b4711c976a 100644 --- a/ioctl/newcmd/hdwallet/hdwalletimport.go +++ b/ioctl/newcmd/hdwallet/hdwalletimport.go @@ -23,19 +23,14 @@ var ( config.English: "import hdwallet using mnemonic", config.Chinese: "通过助记词导入钱包", } - _importCmdUses = map[config.Language]string{ - config.English: "import", - config.Chinese: "import", - } ) // NewHdwalletImportCmd represents the hdwallet import command func NewHdwalletImportCmd(client ioctl.Client) *cobra.Command { - use, _ := client.SelectTranslation(_importCmdUses) short, _ := client.SelectTranslation(_importCmdShorts) return &cobra.Command{ - Use: use, + Use: "import", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/node/node.go b/ioctl/newcmd/node/node.go index a6fd4a46c9..776709d650 100644 --- a/ioctl/newcmd/node/node.go +++ b/ioctl/newcmd/node/node.go @@ -9,10 +9,6 @@ import ( // Multi-language support var ( - _nodeCmdUses = map[config.Language]string{ - config.English: "node", - config.Chinese: "node", - } _nodeCmdShorts = map[config.Language]string{ config.English: "Deal with nodes of IoTeX blockchain", config.Chinese: "处理IoTeX区块链的节点", @@ -21,19 +17,16 @@ var ( // NewNodeCmd represents the new node command. func NewNodeCmd(client ioctl.Client) *cobra.Command { - nodeUses, _ := client.SelectTranslation(_nodeCmdUses) nodeShorts, _ := client.SelectTranslation(_nodeCmdShorts) - + nc := &cobra.Command{ - Use: nodeUses, + Use: "node", Short: nodeShorts, } - nc.AddCommand(NewNodeDelegateCmd(client)) nc.AddCommand(NewNodeRewardCmd(client)) client.SetEndpointWithFlag(nc.PersistentFlags().StringVar) client.SetInsecureWithFlag(nc.PersistentFlags().BoolVar) - return nc } diff --git a/ioctl/newcmd/root.go b/ioctl/newcmd/root.go index a3004b3167..c60cf08a96 100644 --- a/ioctl/newcmd/root.go +++ b/ioctl/newcmd/root.go @@ -24,10 +24,6 @@ var ( config.English: `ioctl is a command-line interface for interacting with IoTeX blockchain.`, config.Chinese: `ioctl 是用于与IoTeX区块链进行交互的命令行工具`, } - _ioctlRootCmdUses = map[config.Language]string{ - config.English: "ioctl", - config.Chinese: "ioctl", - } _xctlRootCmdShorts = map[config.Language]string{ config.English: "Command-line interface for consortium blockchain", config.Chinese: "联盟链命令行工具", @@ -36,20 +32,15 @@ var ( config.English: `xctl is a command-line interface for interacting with consortium blockchain.`, config.Chinese: `xctl 是用于与联盟链进行交互的命令行工具`, } - _xctlRootCmdUses = map[config.Language]string{ - config.English: "xctl", - config.Chinese: "xctl", - } ) // NewIoctl returns ioctl root cmd func NewIoctl(client ioctl.Client) *cobra.Command { - rootUses, _ := client.SelectTranslation(_ioctlRootCmdUses) rootShorts, _ := client.SelectTranslation(_ioctlRootCmdShorts) rootLongs, _ := client.SelectTranslation(_ioctlRootCmdLongs) rootCmd := &cobra.Command{ - Use: rootUses, + Use: "ioctl", Short: rootShorts, Long: rootLongs, } @@ -62,12 +53,11 @@ func NewIoctl(client ioctl.Client) *cobra.Command { // NewXctl returns xctl root cmd func NewXctl(client ioctl.Client) *cobra.Command { - rootUses, _ := client.SelectTranslation(_xctlRootCmdUses) rootShorts, _ := client.SelectTranslation(_xctlRootCmdShorts) rootLongs, _ := client.SelectTranslation(_xctlRootCmdLongs) var rootCmd = &cobra.Command{ - Use: rootUses, + Use: "xctl", Short: rootShorts, Long: rootLongs, } diff --git a/ioctl/newcmd/version/version.go b/ioctl/newcmd/version/version.go index db792e1700..0743125d48 100644 --- a/ioctl/newcmd/version/version.go +++ b/ioctl/newcmd/version/version.go @@ -24,10 +24,6 @@ import ( // Multi-language support var ( - _uses = map[config.Language]string{ - config.English: "version", - config.Chinese: "version", - } _shorts = map[config.Language]string{ config.English: "Print the version of ioctl and node", config.Chinese: "打印ioctl和节点的版本号", @@ -36,10 +32,9 @@ var ( // NewVersionCmd represents the version command func NewVersionCmd(cli ioctl.Client) *cobra.Command { - use, _ := cli.SelectTranslation(_uses) short, _ := cli.SelectTranslation(_shorts) vc := &cobra.Command{ - Use: use, + Use: "version", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { From 9cb9130d5a107ab492e3c273e02e6a2c6b546953 Mon Sep 17 00:00:00 2001 From: huof6890 <68298506@qq.com> Date: Wed, 13 Jul 2022 12:28:48 +0800 Subject: [PATCH 3/3] indent --- ioctl/newcmd/config/config_reset.go | 2 +- ioctl/newcmd/hdwallet/hdwalletexport.go | 2 +- ioctl/newcmd/hdwallet/hdwalletimport.go | 2 +- ioctl/newcmd/node/node.go | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ioctl/newcmd/config/config_reset.go b/ioctl/newcmd/config/config_reset.go index 847167657c..37297db2f9 100644 --- a/ioctl/newcmd/config/config_reset.go +++ b/ioctl/newcmd/config/config_reset.go @@ -7,11 +7,11 @@ package config import ( - "github.com/iotexproject/iotex-core/ioctl/config" "github.com/pkg/errors" "github.com/spf13/cobra" "github.com/iotexproject/iotex-core/ioctl" + "github.com/iotexproject/iotex-core/ioctl/config" ) var ( diff --git a/ioctl/newcmd/hdwallet/hdwalletexport.go b/ioctl/newcmd/hdwallet/hdwalletexport.go index cd226231c8..2e6d1e18e0 100644 --- a/ioctl/newcmd/hdwallet/hdwalletexport.go +++ b/ioctl/newcmd/hdwallet/hdwalletexport.go @@ -27,7 +27,7 @@ func NewHdwalletExportCmd(client ioctl.Client) *cobra.Command { short, _ := client.SelectTranslation(_hdwalletExportCmdShorts) return &cobra.Command{ - Use: "export", + Use: "export", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/hdwallet/hdwalletimport.go b/ioctl/newcmd/hdwallet/hdwalletimport.go index b4711c976a..7d2e52e1d0 100644 --- a/ioctl/newcmd/hdwallet/hdwalletimport.go +++ b/ioctl/newcmd/hdwallet/hdwalletimport.go @@ -30,7 +30,7 @@ func NewHdwalletImportCmd(client ioctl.Client) *cobra.Command { short, _ := client.SelectTranslation(_importCmdShorts) return &cobra.Command{ - Use: "import", + Use: "import", Short: short, Args: cobra.ExactArgs(0), RunE: func(cmd *cobra.Command, args []string) error { diff --git a/ioctl/newcmd/node/node.go b/ioctl/newcmd/node/node.go index 776709d650..1a39ce01cb 100644 --- a/ioctl/newcmd/node/node.go +++ b/ioctl/newcmd/node/node.go @@ -18,7 +18,7 @@ var ( // NewNodeCmd represents the new node command. func NewNodeCmd(client ioctl.Client) *cobra.Command { nodeShorts, _ := client.SelectTranslation(_nodeCmdShorts) - + nc := &cobra.Command{ Use: "node", Short: nodeShorts,