list-accounts add filter alias (#1253)

diff --git a/api/query.go b/api/query.go
index 50889ce..96a708b 100644 (file)
--- a/api/query.go
+++ b/api/query.go
@@ -20,9 +20,19 @@ import (
 
 // POST /list-accounts
 func (a *API) listAccounts(ctx context.Context, filter struct {
-       ID string `json:"id"`
+       ID    string `json:"id"`
+       Alias string `json:"alias"`
 }) Response {
-       accounts, err := a.wallet.AccountMgr.ListAccounts(filter.ID)
+       accountID := filter.ID
+       if filter.Alias != "" {
+               acc, err := a.wallet.AccountMgr.FindByAlias(filter.Alias)
+               if err != nil {
+                       return NewErrorResponse(err)
+               }
+               accountID = acc.ID
+       }
+
+       accounts, err := a.wallet.AccountMgr.ListAccounts(accountID)
        if err != nil {
                log.Errorf("listAccounts: %v", err)
                return NewErrorResponse(err)

diff --git a/cmd/bytomcli/commands/account.go b/cmd/bytomcli/commands/account.go
index 57fd0d6..6a34c39 100644 (file)
--- a/cmd/bytomcli/commands/account.go
+++ b/cmd/bytomcli/commands/account.go
@@ -16,6 +16,7 @@ func init() {
        createAccountCmd.PersistentFlags().StringVarP(&accountToken, "access", "a", "", "access token")
 
        listAccountsCmd.PersistentFlags().StringVar(&accountID, "id", "", "account ID")
+       listAccountsCmd.PersistentFlags().StringVar(&accountAlias, "alias", "", "account alias")
 
        listAddressesCmd.PersistentFlags().StringVar(&accountID, "id", "", "account ID")
        listAddressesCmd.PersistentFlags().StringVar(&accountAlias, "alias", "", "account alias")
@@ -68,8 +69,9 @@ var listAccountsCmd = &cobra.Command{
        Args:  cobra.NoArgs,
        Run: func(cmd *cobra.Command, args []string) {
                filter := struct {
-                       ID string `json:"id"`
-               }{ID: accountID}
+                       ID    string `json:"id"`
+                       Alias string `json:"alias"`
+               }{ID: accountID, Alias: accountAlias}
 
                data, exitCode := util.ClientCall("/list-accounts", &filter)
                if exitCode != util.Success {