remove the weird function (#730)

diff --git a/api/request.go b/api/request.go
index 8a1b4aa..967cf93 100644 (file)
--- a/api/request.go
+++ b/api/request.go
@@ -33,11 +33,11 @@ func (a *API) filterAliases(ctx context.Context, br *BuildRequest) error {
                        case consensus.BTMAlias:
                                m["asset_id"] = consensus.BTMAssetID.String()
                        default:
-                               id, err := a.wallet.AssetReg.GetIDByAlias(alias)
+                               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"] = id
+                               m["asset_id"] = asset.AssetID.String()
                        }
                }
 

diff --git a/asset/asset.go b/asset/asset.go
index 0498f12..ce8641b 100644 (file)
--- a/asset/asset.go
+++ b/asset/asset.go
@@ -219,23 +219,14 @@ func (reg *Registry) FindByID(ctx context.Context, id *bc.AssetID) (*Asset, erro
        return asset, nil
 }
 
-//GetIDByAlias return AssetID string and nil by asset alias,if err ,return "" and err
-func (reg *Registry) GetIDByAlias(alias string) (string, error) {
-       rawID := reg.db.Get(AliasKey(alias))
-       if rawID == nil {
-               return "", ErrFindAsset
-       }
-       return string(rawID), nil
-}
-
 // FindByAlias retrieves an Asset record along with its signer,
 // given an asset alias.
-func (reg *Registry) FindByAlias(ctx context.Context, alias string) (*Asset, error) {
+func (reg *Registry) FindByAlias(alias string) (*Asset, error) {
        reg.cacheMu.Lock()
        cachedID, ok := reg.aliasCache.Get(alias)
        reg.cacheMu.Unlock()
        if ok {
-               return reg.FindByID(ctx, cachedID.(*bc.AssetID))
+               return reg.FindByID(nil, cachedID.(*bc.AssetID))
        }
 
        rawID := reg.db.Get(AliasKey(alias))
@@ -251,7 +242,7 @@ func (reg *Registry) FindByAlias(ctx context.Context, alias string) (*Asset, err
        reg.cacheMu.Lock()
        reg.aliasCache.Add(alias, assetID)
        reg.cacheMu.Unlock()
-       return reg.FindByID(ctx, assetID)
+       return reg.FindByID(nil, assetID)
 }
 
 //GetAliasByID return asset alias string by AssetID string
@@ -356,11 +347,11 @@ func (reg *Registry) UpdateAssetAlias(id, newAlias string) error {
                return ErrNullAlias
        }
 
-       if _, err := reg.GetIDByAlias(normalizedAlias); err == nil {
+       if _, err := reg.FindByAlias(normalizedAlias); err == nil {
                return ErrDuplicateAlias
        }
 
-       findAsset, err := reg.FindByAlias(nil, oldAlias)
+       findAsset, err := reg.FindByAlias(oldAlias)
        if err != nil {
                return err
        }

diff --git a/asset/asset_test.go b/asset/asset_test.go
index 93e6fe8..1959fed 100644 (file)
--- a/asset/asset_test.go
+++ b/asset/asset_test.go
@@ -87,7 +87,6 @@ func TestFindAssetByID(t *testing.T) {
 }
 
 func TestUpdateAssetAlias(t *testing.T) {
-       ctx := context.Background()
        reg := mockNewRegistry(t)
 
        oldAlias := "OLD_ALIAS"
@@ -102,7 +101,7 @@ func TestUpdateAssetAlias(t *testing.T) {
                testutil.FatalErr(t, err)
        }
 
-       asset1, err := reg.FindByAlias(ctx, newAlias)
+       asset1, err := reg.FindByAlias(newAlias)
        if err != nil {
                testutil.FatalErr(t, err)
        }

diff --git a/test/tx_test_util.go b/test/tx_test_util.go
index a434a5a..dc67567 100644 (file)
--- a/test/tx_test_util.go
+++ b/test/tx_test_util.go
@@ -117,7 +117,7 @@ func (g *TxGenerator) assetAmount(assetAlias string, amount uint64) (*bc.AssetAm
                return a, nil
        }
 
-       asset, err := g.Assets.FindByAlias(nil, assetAlias)
+       asset, err := g.Assets.FindByAlias(assetAlias)
        if err != nil {
                return nil, err
        }
@@ -184,7 +184,7 @@ func (g *TxGenerator) AddTxInputFromUtxo(utxo *account.UTXO, accountAlias string
 
 // AddIssuanceInput add a issue input
 func (g *TxGenerator) AddIssuanceInput(assetAlias string, amount uint64) error {
-       asset, err := g.Assets.FindByAlias(nil, assetAlias)
+       asset, err := g.Assets.FindByAlias(assetAlias)
        if err != nil {
                return err
        }