refactor: move some functions to types (#256)

* refactor: move some functions to types

* test: fix tests

* test: fix

* test: fix

x/accountedpool/keeper/accounted_pool_update.go

@@ -8,41 +8,6 @@ import (
 	margintypes "github.com/elys-network/elys/x/margin/types"
 )
 
-// Get Amm Pool Balance
-func (k Keeper) GetAmmPoolBalance(ammPool ammtypes.Pool, denom string) sdk.Int {
-	for _, asset := range ammPool.PoolAssets {
-		if asset.Token.Denom == denom {
-			return asset.Token.Amount
-		}
-	}
-
-	return sdk.ZeroInt()
-}
-
-func (k Keeper) GetMarginPoolBalancesByPosition(marginPool margintypes.Pool, denom string, position margintypes.Position) (sdk.Int, sdk.Int, sdk.Int) {
-	poolAssets := marginPool.GetPoolAssets(position)
-
-	for _, asset := range *poolAssets {
-		if asset.AssetDenom == denom {
-			return asset.AssetBalance, asset.Liabilities, asset.Custody
-		}
-	}
-
-	return sdk.ZeroInt(), sdk.ZeroInt(), sdk.ZeroInt()
-}
-
-// Get Margin Pool Balance
-func (k Keeper) GetMarginPoolBalances(marginPool margintypes.Pool, denom string) (sdk.Int, sdk.Int, sdk.Int) {
-	assetBalanceLong, liabilitiesLong, custodyLong := k.GetMarginPoolBalancesByPosition(marginPool, denom, margintypes.Position_LONG)
-	assetBalanceShort, liabilitiesShort, custodyShort := k.GetMarginPoolBalancesByPosition(marginPool, denom, margintypes.Position_SHORT)
-
-	assetBalance := assetBalanceLong.Add(assetBalanceShort)
-	liabilities := liabilitiesLong.Add(liabilitiesShort)
-	custody := custodyLong.Add(custodyShort)
-
-	return assetBalance, liabilities, custody
-}
-
 func (k Keeper) UpdateAccountedPool(ctx sdk.Context, ammPool ammtypes.Pool, marginPool margintypes.Pool) error {
 	poolId := ammPool.PoolId
 	// Check if already exists
@@ -61,8 +26,11 @@ func (k Keeper) UpdateAccountedPool(ctx sdk.Context, ammPool ammtypes.Pool, marg
 	// amm pool balance + margin pool balance + margin pool liabilties - margin pool custody
 	// But not deducting custody amount here as the balance was already deducted through TakeCustody function.
 	for i, asset := range accountedPool.PoolAssets {
-		aBalance := k.GetAmmPoolBalance(ammPool, asset.Token.Denom)
-		mBalance, mLiabiltiies, _ := k.GetMarginPoolBalances(marginPool, asset.Token.Denom)
+		aBalance, err := margintypes.GetAmmPoolBalance(ammPool, asset.Token.Denom)
+		if err != nil {
+			return err
+		}
+		mBalance, mLiabiltiies, _ := margintypes.GetMarginPoolBalances(marginPool, asset.Token.Denom)
 		accountedAmt := aBalance.Add(mBalance).Add(mLiabiltiies)
 		accountedPool.PoolAssets[i].Token = sdk.NewCoin(asset.Token.Denom, accountedAmt)
 	}

x/margin/keeper/calc_mtp_interest_liabilities.go

@@ -13,7 +13,7 @@ func (k Keeper) CalcMTPBorrowInterestLiabilities(ctx sdk.Context, mtp *types.MTP
 
 	rate.SetFloat64(borrowInterestRate.MustFloat64())
 
-	collateralIndex, _ := k.GetMTPAssetIndex(mtp, collateralAsset, "")
+	collateralIndex, _ := types.GetMTPAssetIndex(mtp, collateralAsset, "")
 	unpaidCollaterals := sdk.ZeroInt()
 	// Calculate collateral borrow interests in base currency
 	if mtp.Collaterals[collateralIndex].Denom == baseCurrency {

x/margin/keeper/check_same_asset_position.go

@@ -5,7 +5,7 @@ import (
 	"github.com/elys-network/elys/x/margin/types"
 )
 
-func (k Keeper) CheckSamePosition(ctx sdk.Context, msg *types.MsgOpen) *types.MTP {
+func (k Keeper) CheckSameAssetPosition(ctx sdk.Context, msg *types.MsgOpen) *types.MTP {
 	mtps := k.GetAllMTPs(ctx)
 	for _, mtp := range mtps {
 		if mtp.Address == msg.Creator && mtp.Position == msg.Position {

x/margin/keeper/check_same_asset_position_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func TestCheckSameAssets_NewPosition(t *testing.T) {
+func TestCheckSameAssetPosition_NewPosition(t *testing.T) {
 	app := simapp.InitElysTestApp(true)
 	ctx := app.BaseApp.NewContext(true, tmproto.Header{})
 
@@ -29,7 +29,7 @@ func TestCheckSameAssets_NewPosition(t *testing.T) {
 		Leverage:         sdk.NewDec(1),
 	}
 
-	mtp = k.CheckSamePosition(ctx, msg)
+	mtp = k.CheckSameAssetPosition(ctx, msg)
 
 	// Expect no error
 	assert.Nil(t, mtp)

x/margin/keeper/estimate_and_repay.go

@@ -7,7 +7,7 @@ import (
 )
 
 func (k Keeper) EstimateAndRepay(ctx sdk.Context, mtp types.MTP, pool types.Pool, ammPool ammtypes.Pool, collateralAsset string, custodyAsset string) (sdk.Int, error) {
-	collateralIndex, custodyIndex := k.GetMTPAssetIndex(&mtp, collateralAsset, custodyAsset)
+	collateralIndex, custodyIndex := types.GetMTPAssetIndex(&mtp, collateralAsset, custodyAsset)
 	cutodyAmtTokenIn := sdk.NewCoin(mtp.Custodies[custodyIndex].Denom, mtp.Custodies[custodyIndex].Amount)
 	repayAmount, err := k.EstimateSwap(ctx, cutodyAmtTokenIn, mtp.Collaterals[collateralIndex].Denom, ammPool)
 	if err != nil {

x/margin/keeper/handle_borrow_interest_payment.go

@@ -18,7 +18,7 @@ func (k Keeper) HandleBorrowInterestPayment(ctx sdk.Context, collateralAsset str
 			return finalBorrowInterestPayment
 		}
 	} else { // else update unpaid mtp interest
-		collateralIndex, _ := k.GetMTPAssetIndex(mtp, collateralAsset, "")
+		collateralIndex, _ := types.GetMTPAssetIndex(mtp, collateralAsset, "")
 		if collateralIndex < 0 {
 			return sdk.ZeroInt()
 		}

x/margin/keeper/invariant_check.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/elys-network/elys/x/margin/types"
 )
 
 func (k Keeper) AmmPoolBalanceCheck(ctx sdk.Context, poolId uint64) error {
@@ -41,7 +42,7 @@ func (k Keeper) AmmPoolBalanceCheck(ctx sdk.Context, poolId uint64) error {
 	// AMM pool balance differs bank module balance
 	balances := k.bankKeeper.GetAllBalances(ctx, address)
 	for _, balance := range balances {
-		ammBalance, _ := k.GetAmmPoolBalance(ctx, ammPool, balance.Denom)
+		ammBalance, _ := types.GetAmmPoolBalance(ammPool, balance.Denom)
 		collateralAmt := mtpCollateralBalances.AmountOf(balance.Denom)
 
 		diff := ammBalance.Add(collateralAmt).Sub(balance.Amount)

x/margin/keeper/keeper.go

@@ -166,7 +166,7 @@ func (k Keeper) Borrow(ctx sdk.Context, collateralAsset string, custodyAsset str
 		liabilitiesDec = sdk.NewDecFromInt(liabilityAmt)
 	}
 
-	collateralIndex, custodyIndex := k.GetMTPAssetIndex(mtp, collateralAsset, custodyAsset)
+	collateralIndex, custodyIndex := types.GetMTPAssetIndex(mtp, collateralAsset, custodyAsset)
 	if collateralIndex < 0 || custodyIndex < 0 {
 		return sdkerrors.Wrap(types.ErrBalanceNotAvailable, "MTP collateral or custody invalid!")
 	}
@@ -232,7 +232,7 @@ func (k Keeper) CalculatePoolHealthByPosition(ctx sdk.Context, pool *types.Pool,
 	poolAssets := pool.GetPoolAssets(position)
 	H := sdk.NewDec(1)
 	for _, asset := range *poolAssets {
-		ammBalance, err := k.GetAmmPoolBalance(ctx, ammPool, asset.AssetDenom)
+		ammBalance, err := types.GetAmmPoolBalance(ammPool, asset.AssetDenom)
 		if err != nil {
 			return sdk.ZeroDec()
 		}
@@ -280,7 +280,7 @@ func (k Keeper) TakeInCustody(ctx sdk.Context, mtp types.MTP, pool *types.Pool)
 }
 
 func (k Keeper) IncrementalBorrowInterestPayment(ctx sdk.Context, collateralAsset string, custodyAsset string, borrowInterestPayment sdk.Int, mtp *types.MTP, pool *types.Pool, ammPool ammtypes.Pool) (sdk.Int, error) {
-	collateralIndex, custodyIndex := k.GetMTPAssetIndex(mtp, collateralAsset, custodyAsset)
+	collateralIndex, custodyIndex := types.GetMTPAssetIndex(mtp, collateralAsset, custodyAsset)
 
 	entry, found := k.apKeeper.GetEntry(ctx, ptypes.BaseCurrency)
 	if !found {
@@ -383,7 +383,7 @@ func (k Keeper) BorrowInterestRateComputationByPosition(ctx sdk.Context, pool ty
 	poolAssets := pool.GetPoolAssets(position)
 	targetBorrowInterestRate := sdk.OneDec()
 	for _, asset := range *poolAssets {
-		ammBalance, err := k.GetAmmPoolBalance(ctx, ammPool, asset.AssetDenom)
+		ammBalance, err := types.GetAmmPoolBalance(ammPool, asset.AssetDenom)
 		if err != nil {
 			return sdk.ZeroDec(), err
 		}