minor changes in gamm apptesting func (#2958)

* minor changes in gamm apptesting func

* remove RunCustomSwap

app/apptesting/gamm.go

@@ -3,6 +3,7 @@ package apptesting
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
+	gammkeeper "github.com/osmosis-labs/osmosis/v12/x/gamm/keeper"
 	"github.com/osmosis-labs/osmosis/v12/x/gamm/pool-models/balancer"
 	gammtypes "github.com/osmosis-labs/osmosis/v12/x/gamm/types"
 )
@@ -117,20 +118,30 @@ func (s *KeeperTestHelper) RunBasicSwap(poolId uint64) {
 	s.FundAcc(s.TestAccs[0], swapIn)
 
 	msg := gammtypes.MsgSwapExactAmountIn{
-		Sender:            string(s.TestAccs[0]),
+		Sender:            s.TestAccs[0].String(),
 		Routes:            []gammtypes.SwapAmountInRoute{{PoolId: poolId, TokenOutDenom: denoms[1]}},
 		TokenIn:           swapIn[0],
 		TokenOutMinAmount: sdk.ZeroInt(),
 	}
-	// TODO: switch to message
-	_, err = s.App.GAMMKeeper.SwapExactAmountIn(s.Ctx, s.TestAccs[0], poolId, msg.TokenIn, denoms[1], msg.TokenOutMinAmount)
+
+	gammMsgServer := gammkeeper.NewMsgServerImpl(s.App.GAMMKeeper)
+	_, err = gammMsgServer.SwapExactAmountIn(sdk.WrapSDKContext(s.Ctx), &msg)
 	s.Require().NoError(err)
 }
 
 func (s *KeeperTestHelper) RunBasicExit(poolId uint64) {
 	shareInAmount := sdk.NewInt(100)
 	tokenOutMins := sdk.NewCoins()
-	_, err := s.App.GAMMKeeper.ExitPool(s.Ctx, s.TestAccs[0], poolId, shareInAmount, tokenOutMins)
+
+	msg := gammtypes.MsgExitPool{
+		Sender:        s.TestAccs[0].String(),
+		PoolId:        poolId,
+		ShareInAmount: shareInAmount,
+		TokenOutMins:  tokenOutMins,
+	}
+
+	gammMsgServer := gammkeeper.NewMsgServerImpl(s.App.GAMMKeeper)
+	_, err := gammMsgServer.ExitPool(sdk.WrapSDKContext(s.Ctx), &msg)
 	s.Require().NoError(err)
 }
 
@@ -148,12 +159,13 @@ func (s *KeeperTestHelper) RunBasicJoin(poolId uint64) {
 
 	totalPoolShare := pool.GetTotalShares()
 	msg := gammtypes.MsgJoinPool{
-		Sender:         string(s.TestAccs[0]),
+		Sender:         s.TestAccs[0].String(),
 		PoolId:         poolId,
 		ShareOutAmount: totalPoolShare.Quo(sdk.NewInt(100000)),
 		TokenInMaxs:    tokenIn,
 	}
-	// TODO: switch to message
-	_, _, err = s.App.GAMMKeeper.JoinPoolNoSwap(s.Ctx, s.TestAccs[0], poolId, msg.ShareOutAmount, msg.TokenInMaxs)
+
+	gammMsgServer := gammkeeper.NewMsgServerImpl(s.App.GAMMKeeper)
+	_, err = gammMsgServer.JoinPool(sdk.WrapSDKContext(s.Ctx), &msg)
 	s.Require().NoError(err)
 }