refactoring code by extracting some meaningful methods

diff --git a/api/request.go b/api/request.go
index 171f7d3..de4c6b6 100644 (file)
--- a/api/request.go
+++ b/api/request.go
@@ -25,33 +25,46 @@ type BuildRequest struct {
        TimeRange uint64                   `json:"time_range"`
 }
 
-func (a *API) filterAliases(ctx context.Context, br *BuildRequest) error {
+func (a *API) completeMissingIds(ctx context.Context, br *BuildRequest) error {
        for i, m := range br.Actions {
-               id, _ := m["asset_id"].(string)
-               alias, _ := m["asset_alias"].(string)
-               alias = strings.ToUpper(alias)
-               if id == "" && alias != "" {
-                       switch alias {
-                       case consensus.BTMAlias:
-                               m["asset_id"] = consensus.BTMAssetID.String()
-                       default:
-                               asset, err := a.wallet.AssetReg.FindByAlias(alias)
-                               if err != nil {
-                                       return errors.WithDetailf(err, "invalid asset alias %s on action %d", alias, i)
-                               }
-                               m["asset_id"] = asset.AssetID.String()
-                       }
+               if err := a.completeMissingAssetId(m, i); err != nil {
+                       return err
+               }
+               if err := a.completeMissingAccountId(m, i, ctx); err != nil {
+                       return err
                }
+       }
+       return nil
+}
 
-               id, _ = m["account_id"].(string)
-               alias, _ = m["account_alias"].(string)
-               if id == "" && alias != "" {
-                       acc, err := a.wallet.AccountMgr.FindByAlias(ctx, alias)
+func (a *API) completeMissingAssetId(m map[string]interface{}, index int) error {
+       id, _ := m["asset_id"].(string)
+       alias, _ := m["asset_alias"].(string)
+       if id == "" && alias != "" {
+               alias = strings.ToUpper(alias)
+               switch alias {
+               case consensus.BTMAlias:
+                       m["asset_id"] = consensus.BTMAssetID.String()
+               default:
+                       asset, err := a.wallet.AssetReg.FindByAlias(alias)
                        if err != nil {
-                               return errors.WithDetailf(err, "invalid account alias %s on action %d", alias, i)
+                               return errors.WithDetailf(err, "invalid asset alias %s on action %d", alias, index)
                        }
-                       m["account_id"] = acc.ID
+                       m["asset_id"] = asset.AssetID.String()
+               }
+       }
+       return nil
+}
+
+func (a *API) completeMissingAccountId(m map[string]interface{}, index int, ctx context.Context) error {
+       id, _ := m["account_id"].(string)
+       alias, _ := m["account_alias"].(string)
+       if id == "" && alias != "" {
+               acc, err := a.wallet.AccountMgr.FindByAlias(ctx, alias)
+               if err != nil {
+                       return errors.WithDetailf(err, "invalid account alias %s on action %d", alias, index)
                }
+               m["account_id"] = acc.ID
        }
        return nil
 }

diff --git a/api/transact.go b/api/transact.go
index 969663a..f547cf5 100644 (file)
--- a/api/transact.go
+++ b/api/transact.go
@@ -60,8 +60,7 @@ func onlyHaveSpendActions(req *BuildRequest) bool {
 }
 
 func (a *API) buildSingle(ctx context.Context, req *BuildRequest) (*txbuilder.Template, error) {
-       err := a.filterAliases(ctx, req)
-       if err != nil {
+       if err := a.completeMissingIds(ctx, req); err != nil {
                return nil, err
        }