From 74fe56572ae3675f22108df28a5a25bb5b147625 Mon Sep 17 00:00:00 2001
From: paladz <453256728@qq.com>
Date: Thu, 19 Apr 2018 20:52:15 +0800
Subject: [PATCH] fix conflix

---
 api/query.go   |  8 ++------
 asset/asset.go | 14 +++++++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/api/query.go b/api/query.go
index e3091f85..455e1ed3 100644
--- a/api/query.go
+++ b/api/query.go
@@ -31,13 +31,9 @@ func (a *API) listAccounts(ctx context.Context) Response {
 
 // POST /get-asset
 func (a *API) getAsset(ctx context.Context, filter struct {
-	ID chainjson.HexBytes `json:"id"`
+	ID string `json:"id"`
 }) Response {
-	var b32 [32]byte
-	copy(b32[:], filter.ID)
-	assetID := bc.NewAssetID(b32)
-
-	asset, err := a.wallet.AssetReg.GetAsset(&assetID)
+	asset, err := a.wallet.AssetReg.GetAsset(filter.ID)
 	if err != nil {
 		log.Errorf("getAsset: %v", err)
 		return NewErrorResponse(err)
diff --git a/asset/asset.go b/asset/asset.go
index b26d8831..0498f129 100644
--- a/asset/asset.go
+++ b/asset/asset.go
@@ -275,21 +275,25 @@ func (reg *Registry) GetAliasByID(id string) string {
 }
 
 // GetAsset get asset by assetID
-func (reg *Registry) GetAsset(id *bc.AssetID) (*Asset, error) {
-	asset := &Asset{}
+func (reg *Registry) GetAsset(id string) (*Asset, error) {
+	var assetID bc.AssetID
+	if err := assetID.UnmarshalText([]byte(id)); err != nil {
+		return nil, err
+	}
 
-	if id.String() == DefaultNativeAsset.AssetID.String() {
+	if assetID.String() == DefaultNativeAsset.AssetID.String() {
 		return DefaultNativeAsset, nil
 	}
 
-	if interAsset := reg.db.Get(Key(id)); interAsset != nil {
+	asset := &Asset{}
+	if interAsset := reg.db.Get(Key(&assetID)); interAsset != nil {
 		if err := json.Unmarshal(interAsset, asset); err != nil {
 			return nil, err
 		}
 		return asset, nil
 	}
 
-	if extAsset := reg.db.Get(ExtAssetKey(id)); extAsset != nil {
+	if extAsset := reg.db.Get(ExtAssetKey(&assetID)); extAsset != nil {
 		if err := json.Unmarshal(extAsset, asset); err != nil {
 			return nil, err
 		}
-- 
2.11.0