From: HAOYUatHZ Date: Wed, 22 May 2019 02:08:38 +0000 (+0800) Subject: revert X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a869d65d641b8105702eb19a5445671ff3d7386;p=bytom%2Fvapor.git revert --- diff --git a/asset/asset.go b/asset/asset.go index a20a545a..12ae60b3 100644 --- a/asset/asset.go +++ b/asset/asset.go @@ -33,7 +33,7 @@ var ( func initNativeAsset() { alias := consensus.BTMAlias - definitionBytes, _ := SerializeAssetDef(consensus.BTMDefinitionMap) + definitionBytes, _ := serializeAssetDef(consensus.BTMDefinitionMap) DefaultNativeAsset = &Asset{ AssetID: *consensus.BTMAssetID, Alias: &alias, @@ -275,12 +275,12 @@ func (reg *Registry) ListAssets(id string) ([]*Asset, error) { return assets, nil } -// SerializeAssetDef produces a canonical byte representation of an asset +// serializeAssetDef produces a canonical byte representation of an asset // definition. Currently, this is implemented using pretty-printed JSON. // As is the standard for Go's map[string] serialization, object keys will // appear in lexicographic order. Although this is mostly meant for machine // consumption, the JSON is pretty-printed for easy reading. -func SerializeAssetDef(def map[string]interface{}) ([]byte, error) { +func serializeAssetDef(def map[string]interface{}) ([]byte, error) { if def == nil { def = make(map[string]interface{}, 0) } diff --git a/asset/builder.go b/asset/builder.go index 10a04a36..7de19cbd 100644 --- a/asset/builder.go +++ b/asset/builder.go @@ -66,7 +66,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu // Handle asset definition. // Asset issuance's legality is guaranteed by the federation. - rawDefinition, err := SerializeAssetDef(a.AssetDefinition) + rawDefinition, err := serializeAssetDef(a.AssetDefinition) if err != nil { return ErrSerializing } @@ -76,7 +76,7 @@ func (a *crossInAction) Build(ctx context.Context, builder *txbuilder.TemplateBu } if preAsset, _ := a.assets.GetAsset(a.AssetId.String()); preAsset != nil { // GetAsset() doesn't unmashall for RawDefinitionBytes - preRawDefinition, err := SerializeAssetDef(preAsset.DefinitionMap) + preRawDefinition, err := serializeAssetDef(preAsset.DefinitionMap) if err != nil { return ErrSerializing }