Merge pull request #380 from comdex-official/refactor-5

refactor and resolve issues
comdex-official · Aug 5, 2022 · ce98d74 · ce98d74
2 parents 87f52f7 + 39359c5
commit ce98d74
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 18 deletions.
diff --git a/x/collector/keeper/collector.go b/x/collector/keeper/collector.go
@@ -491,15 +491,14 @@ func (k Keeper) SetAuctionMappingForApp(ctx sdk.Context, records ...types.Collec
 	return nil
 }
 
-func (k Keeper) DuplicateCheck(ctx sdk.Context, appId, assetId uint64) (found bool, index int) {
-	result, found := k.GetAuctionMappingForApp(ctx, appId)
+func (k Keeper) DuplicateCheck(ctx sdk.Context, appID, assetID uint64) (found bool, index int) {
+	result, found := k.GetAuctionMappingForApp(ctx, appID)
 	if !found {
 		return false, 0
-	} else {
-		for i, data := range result.AssetIdToAuctionLookup {
-			if data.AssetId == assetId {
-				return true, i
-			}
+	}
+	for i, data := range result.AssetIdToAuctionLookup {
+		if data.AssetId == assetID {
+			return true, i
 		}
 	}
 

diff --git a/x/esm/keeper/esm.go b/x/esm/keeper/esm.go
@@ -4,7 +4,6 @@ import (
 	"github.com/comdex-official/comdex/app/wasm/bindings"
 	assettypes "github.com/comdex-official/comdex/x/asset/types"
 	"github.com/comdex-official/comdex/x/esm/types"
-	esmtypes "github.com/comdex-official/comdex/x/esm/types"
 	vaulttypes "github.com/comdex-official/comdex/x/vault/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
@@ -422,7 +421,7 @@ func (k Keeper) SetUpCollateralRedemptionForVault(ctx sdk.Context, appId uint64)
 			k.DeleteAddressFromAppExtendedPairVaultMapping(ctx, data.ExtendedPairVaultID, data.Id, data.AppId)
 			esmStatus, found := k.GetESMStatus(ctx, data.AppId)
 			if !found {
-				return esmtypes.ErrESMParamsNotFound
+				return types.ErrESMParamsNotFound
 			}
 			esmStatus.VaultRedemptionStatus = true
 			k.SetESMStatus(ctx, esmStatus)
@@ -523,7 +522,7 @@ func (k Keeper) SetUpCollateralRedemptionForStableVault(ctx sdk.Context, appId u
 			k.DeleteAddressFromAppExtendedPairVaultMapping(ctx, data.ExtendedPairVaultID, data.Id, data.AppId)
 			esmStatus, found := k.GetESMStatus(ctx, data.AppId)
 			if !found {
-				return esmtypes.ErrESMParamsNotFound
+				return types.ErrESMParamsNotFound
 			}
 			esmStatus.StableVaultRedemptionStatus = true
 			k.SetESMStatus(ctx, esmStatus)

diff --git a/x/esm/keeper/klsw.go b/x/esm/keeper/klsw.go
@@ -22,10 +22,10 @@ func (k Keeper) SetKillSwitchData(ctx sdk.Context, switchParams types.KillSwitch
 	return nil
 }
 
-func (k Keeper) GetKillSwitchData(ctx sdk.Context, app_id uint64) (switchParams types.KillSwitchParams, found bool) {
+func (k Keeper) GetKillSwitchData(ctx sdk.Context, appID uint64) (switchParams types.KillSwitchParams, found bool) {
 	var (
 		store = ctx.KVStore(k.storeKey)
-		key   = types.KillSwitchData(app_id)
+		key   = types.KillSwitchData(appID)
 		value = store.Get(key)
 	)
 
@@ -60,8 +60,8 @@ func (k Keeper) GetAllKillSwitchData(ctx sdk.Context) (killSwitchParams []types.
 }
 
 func (k Keeper) Admin(ctx sdk.Context, from string) bool {
-	var from_address = k.AdminParam(ctx)
-	for _, addr := range from_address {
+	var fromAddress = k.AdminParam(ctx)
+	for _, addr := range fromAddress {
 		if addr == from {
 			return true
 		}

diff --git a/x/esm/types/keys.go b/x/esm/types/keys.go
@@ -47,8 +47,8 @@ func ESMStatusKey(id uint64) []byte {
 	return append(ESMStatusPrefix, sdk.Uint64ToBigEndian(id)...)
 }
 
-func KillSwitchData(appId uint64) []byte {
-	return append(KillSwitchDataKey, sdk.Uint64ToBigEndian(appId)...)
+func KillSwitchData(appID uint64) []byte {
+	return append(KillSwitchDataKey, sdk.Uint64ToBigEndian(appID)...)
 }
 
 func UserDepositByAppKey(owner string, id uint64) []byte {

diff --git a/x/liquidation/expected/keeper.go b/x/liquidation/expected/keeper.go
@@ -51,7 +51,7 @@ type AuctionKeeper interface {
 }
 
 type EsmKeeper interface {
-	GetKillSwitchData(ctx sdk.Context, app_id uint64) (esmtypes.KillSwitchParams, bool)
+	GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool)
 	GetESMStatus(ctx sdk.Context, id uint64) (esmStatus esmtypes.ESMStatus, found bool)
 }
 

diff --git a/x/vault/expected/keeper.go b/x/vault/expected/keeper.go
@@ -36,7 +36,7 @@ type CollectorKeeper interface {
 }
 
 type EsmKeeper interface {
-	GetKillSwitchData(ctx sdk.Context, app_id uint64) (esmtypes.KillSwitchParams, bool)
+	GetKillSwitchData(ctx sdk.Context, appID uint64) (esmtypes.KillSwitchParams, bool)
 	GetESMStatus(ctx sdk.Context, id uint64) (esmStatus esmtypes.ESMStatus, found bool)
 	GetESMMarketForAsset(ctx sdk.Context, id uint64) (esmMarket esmtypes.ESMMarketPrice, found bool)
 	GetESMTriggerParams(ctx sdk.Context, id uint64) (esmTriggerParams esmtypes.ESMTriggerParams, found bool)