fix masterchef swap method

x/amm/types/params_test.go

@@ -1,10 +1,11 @@
 package types_test
 
 import (
+	"testing"
+
 	"cosmossdk.io/math"
 	"github.com/elys-network/elys/x/amm/types"
 	"github.com/stretchr/testify/require"
-	"testing"
 )
 
 func TestDefaultParams(t *testing.T) {

x/masterchef/keeper/abci.go

@@ -332,10 +332,7 @@ func (k Keeper) ConvertGasFeesToUsdc(ctx sdk.Context, baseCurrency string, addre
 			continue
 		}
 
-		// Executes the swap in the pool and stores the output. Updates pool assets but
-		// does not actually transfer any tokens to or from the pool.
-		snapshot := k.amm.GetAccountedPoolSnapshotOrSet(ctx, pool)
-		tokenOutCoin, _, _, _, err := k.amm.SwapOutAmtGivenIn(ctx, pool.PoolId, k.oracleKeeper, &snapshot, sdk.Coins{tokenIn}, baseCurrency, math.LegacyZeroDec(), math.LegacyOneDec())
+		tokenOutAmount, err := k.amm.InternalSwapExactAmountIn(ctx, address, address, pool, tokenIn, baseCurrency, math.ZeroInt(), math.LegacyZeroDec())
 		if err != nil {
 			// Continue as we can swap it when this amount is higher
 			if err == ammtypes.ErrTokenOutAmountZero {
@@ -352,18 +349,6 @@ func (k Keeper) ConvertGasFeesToUsdc(ctx sdk.Context, baseCurrency string, addre
 			return sdk.Coins{}, err
 		}
 
-		tokenOutAmount := tokenOutCoin.Amount
-		if !tokenOutAmount.IsPositive() {
-			continue
-		}
-
-		// Settles balances between the tx sender and the pool to match the swap that was executed earlier.
-		// Also emits a swap event and updates related liquidity metrics.
-		_, err = k.amm.UpdatePoolForSwap(ctx, pool, address, address, tokenIn, tokenOutCoin, math.LegacyZeroDec(), math.LegacyZeroDec(), math.LegacyZeroDec())
-		if err != nil {
-			return sdk.Coins{}, err
-		}
-
 		// Swapped USDC coin
 		swappedCoins := sdk.NewCoins(sdk.NewCoin(baseCurrency, tokenOutAmount))
 

x/masterchef/types/expected_keepers.go

@@ -107,6 +107,16 @@ type AmmKeeper interface {
 	CalcOutAmtGivenIn(ctx sdk.Context, poolId uint64, oracle ammtypes.OracleKeeper, snapshot *ammtypes.Pool, tokensIn sdk.Coins, tokenOutDenom string, swapFee math.LegacyDec) (sdk.Coin, math.LegacyDec, error)
 	GetEdenDenomPrice(ctx sdk.Context, baseCurrency string) math.LegacyDec
 	GetTokenPrice(ctx sdk.Context, tokenInDenom, baseCurrency string) math.LegacyDec
+	InternalSwapExactAmountIn(
+		ctx sdk.Context,
+		sender sdk.AccAddress,
+		recipient sdk.AccAddress,
+		pool ammtypes.Pool,
+		tokenIn sdk.Coin,
+		tokenOutDenom string,
+		tokenOutMinAmount math.Int,
+		swapFee math.LegacyDec,
+	) (tokenOutAmount math.Int, err error)
 }
 
 // OracleKeeper defines the expected interface needed to retrieve price info