From: HAOYUatHZ <37070449+HAOYUatHZ@users.noreply.github.com> Date: Mon, 8 Jul 2019 07:11:37 +0000 (+0800) Subject: refactor: change asset.Definition encoding (#250) X-Git-Tag: v1.0.5~171 X-Git-Url: http://git.osdn.net/view?p=bytom%2Fvapor.git;a=commitdiff_plain;h=229d9e2c39150278f9e1de83aaab64409e338e8f refactor: change asset.Definition encoding (#250) --- diff --git a/federation/database/orm/asset.go b/federation/database/orm/asset.go index f1fbb051..1672ce99 100644 --- a/federation/database/orm/asset.go +++ b/federation/database/orm/asset.go @@ -5,11 +5,11 @@ import ( ) type Asset struct { - ID uint64 `gorm:"primary_key;foreignkey:ID" json:"-"` - AssetID string `json:"asset_id"` - IssuanceProgram string `json:"-"` - VMVersion uint64 `json:"-"` - RawDefinitionByte string `json:"-"` - CreatedAt types.Timestamp `json:"-"` - UpdatedAt types.Timestamp `json:"-"` + ID uint64 `gorm:"primary_key;foreignkey:ID" json:"-"` + AssetID string `json:"asset_id"` + IssuanceProgram string `json:"-"` + VMVersion uint64 `json:"-"` + Definition string `json:"-"` + CreatedAt types.Timestamp `json:"-"` + UpdatedAt types.Timestamp `json:"-"` } diff --git a/federation/synchron/mainchain_keeper.go b/federation/synchron/mainchain_keeper.go index aeae20a3..e3ea7a39 100644 --- a/federation/synchron/mainchain_keeper.go +++ b/federation/synchron/mainchain_keeper.go @@ -314,10 +314,10 @@ func (m *mainchainKeeper) processIssuing(txs []*types.Tx) error { } m.assetStore.Add(&orm.Asset{ - AssetID: assetID.String(), - IssuanceProgram: hex.EncodeToString(inp.IssuanceProgram), - VMVersion: inp.VMVersion, - RawDefinitionByte: hex.EncodeToString(inp.AssetDefinition), + AssetID: assetID.String(), + IssuanceProgram: hex.EncodeToString(inp.IssuanceProgram), + VMVersion: inp.VMVersion, + Definition: string(inp.AssetDefinition), }) } }