OSDN Git Service

rename GetByAssetID
authorHAOYUatHZ <haoyu@protonmail.com>
Wed, 19 Jun 2019 08:19:25 +0000 (16:19 +0800)
committerHAOYUatHZ <haoyu@protonmail.com>
Wed, 19 Jun 2019 08:19:25 +0000 (16:19 +0800)
federation/database/asset_store.go
federation/synchron/mainchain_keeper.go
federation/synchron/sidechain_keeper.go

index bca0fa8..6019ce5 100644 (file)
@@ -31,7 +31,7 @@ func (a *AssetStore) GetByOrmID(id uint64) (*orm.Asset, error) {
        return asset, nil
 }
 
-func (a *AssetStore) Get(assetID string) (*orm.Asset, error) {
+func (a *AssetStore) GetByAssetID(assetID string) (*orm.Asset, error) {
        if v, ok := a.cache.Get(assetID); ok {
                return v.(*orm.Asset), nil
        }
index 430308e..7043c46 100644 (file)
@@ -212,7 +212,7 @@ func (m *mainchainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types
                        continue
                }
 
-               asset, err := m.assetStore.Get(rawOutput.OutputCommitment.AssetAmount.AssetId.String())
+               asset, err := m.assetStore.GetByAssetID(rawOutput.OutputCommitment.AssetAmount.AssetId.String())
                if err != nil {
                        return nil, err
                }
@@ -273,7 +273,7 @@ func (m *mainchainKeeper) processIssuing(txs []*types.Tx) error {
                        switch inp := input.TypedInput.(type) {
                        case *types.IssuanceInput:
                                assetID := inp.AssetID()
-                               if _, err := m.assetStore.Get(assetID.String()); err == nil {
+                               if _, err := m.assetStore.GetByAssetID(assetID.String()); err == nil {
                                        continue
                                }
 
index 8179b82..e5c5635 100644 (file)
@@ -226,7 +226,7 @@ func (s *sidechainKeeper) getCrossChainReqs(crossTransactionID uint64, tx *types
                        continue
                }
 
-               asset, err := s.assetStore.Get(rawOutput.OutputCommitment().AssetAmount.AssetId.String())
+               asset, err := s.assetStore.GetByAssetID(rawOutput.OutputCommitment().AssetAmount.AssetId.String())
                if err != nil {
                        return nil, err
                }