fix(app): fix initialization of transferKeeper for x/rollapp (#1495)

dymensionxyz · Nov 17, 2024 · b8a69b8 · b8a69b8
1 parent c0774fc
commit b8a69b8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/app/apptesting/gamm.go b/app/apptesting/gamm.go
@@ -14,8 +14,8 @@ import (
 // 10^18 multiplier
 var EXP = sdk.NewIntFromBigInt(new(big.Int).Exp(big.NewInt(10), big.NewInt(18), nil))
 
-// Default sender for amm messages
-var sender = sdk.MustAccAddressFromBech32(alice)
+// Default Sender for amm messages
+var Sender = sdk.MustAccAddressFromBech32(alice)
 
 var DefaultAcctFunds sdk.Coins = sdk.NewCoins(
 	sdk.NewCoin("adym", EXP.Mul(sdk.NewInt(1_000_000))),
@@ -45,9 +45,9 @@ var DefaultPoolAssets = []balancer.PoolAsset{
 // This is the generic method called by other PreparePool wrappers
 // It funds the sender account with DefaultAcctFunds
 func (s *KeeperTestHelper) PrepareCustomPool(assets []balancer.PoolAsset, params balancer.PoolParams) uint64 {
-	s.FundAcc(sender, DefaultAcctFunds)
+	s.FundAcc(Sender, DefaultAcctFunds)
 
-	msg := balancer.NewMsgCreateBalancerPool(sender, params, assets, "")
+	msg := balancer.NewMsgCreateBalancerPool(Sender, params, assets, "")
 	poolId, err := s.App.PoolManagerKeeper.CreatePool(s.Ctx, msg)
 	s.NoError(err)
 	return poolId

diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -478,6 +478,7 @@ func (a *AppKeepers) InitKeepers(
 		a.BankKeeper,
 		a.ScopedTransferKeeper,
 	)
+	a.RollappKeeper.SetTransferKeeper(a.TransferKeeper)
 
 	a.DelayedAckKeeper = *delayedackkeeper.NewKeeper(
 		appCodec,

diff --git a/x/gamm/amm_test.go b/x/gamm/amm_test.go
@@ -35,9 +35,10 @@ func (s *KeeperTestSuite) SetupTest() {
 
 func (s *KeeperTestSuite) TestSwapsRevenue() {
 	// Create a pool with 100_000 DYM and 100_000 FOO
+	fooDenom := "ibc/A88EE35932B15B981676EFA6700342EDEF63C41C9EE1265EA5BEDAE0A6518CEA"
 	poolCoins := sdk.NewCoins(
 		sdk.NewCoin("adym", apptesting.EXP.Mul(sdk.NewInt(100_000))),
-		sdk.NewCoin("foo", apptesting.EXP.Mul(sdk.NewInt(100_000))),
+		sdk.NewCoin(fooDenom, apptesting.EXP.Mul(sdk.NewInt(100_000))),
 	)
 
 	testCases := []struct {
@@ -78,14 +79,15 @@ func (s *KeeperTestSuite) TestSwapsRevenue() {
 			params.TakerFee = tc.takerFee
 			s.App.GAMMKeeper.SetParams(s.Ctx, params)
 
+			s.FundAcc(apptesting.Sender, apptesting.DefaultAcctFunds.Add(sdk.NewCoin(fooDenom, apptesting.EXP.Mul(sdk.NewInt(1_000_000)))))
 			poolId := s.PrepareCustomPoolFromCoins(poolCoins, balancer.PoolParams{
 				SwapFee: tc.swapFee,
 				ExitFee: sdk.ZeroDec(),
 			})
 
 			// join pool
 			addr := sample.Acc()
-			s.FundAcc(addr, apptesting.DefaultAcctFunds)
+			s.FundAcc(addr, apptesting.DefaultAcctFunds.Add(sdk.NewCoin(fooDenom, apptesting.EXP.Mul(sdk.NewInt(1_000_000)))))
 			shares, _ := s.RunBasicJoin(poolId, addr.String())
 
 			// check position
@@ -94,21 +96,21 @@ func (s *KeeperTestSuite) TestSwapsRevenue() {
 			position, err := pool.CalcExitPoolCoinsFromShares(s.Ctx, shares, sdk.ZeroDec())
 			s.Require().NoError(err)
 			liquidity := pool.GetTotalPoolLiquidity(s.Ctx)
-			spot, err := s.App.GAMMKeeper.CalculateSpotPrice(s.Ctx, poolId, "foo", "adym")
+			spot, err := s.App.GAMMKeeper.CalculateSpotPrice(s.Ctx, poolId, fooDenom, "adym")
 			s.Require().NoError(err)
 			s.T().Logf("positionBefore: %s, liquidity: %s, spot: %s", position, liquidity, spot)
 
 			// swap tokens (swap 5 DYM for FOO) and vice versa
-			s.RunBasicSwap(poolId, addr.String(), sdk.NewCoin("adym", apptesting.EXP.Mul(sdk.NewInt(5))), "foo")
-			s.RunBasicSwap(poolId, addr.String(), sdk.NewCoin("foo", apptesting.EXP.Mul(sdk.NewInt(5))), "adym")
+			s.RunBasicSwap(poolId, addr.String(), sdk.NewCoin("adym", apptesting.EXP.Mul(sdk.NewInt(5))), fooDenom)
+			s.RunBasicSwap(poolId, addr.String(), sdk.NewCoin(fooDenom, apptesting.EXP.Mul(sdk.NewInt(5))), "adym")
 
 			// check position
 			p, _ = s.App.GAMMKeeper.GetPool(s.Ctx, poolId)
 			pool = p.(*balancer.Pool) // nolint: errcheck
 			liquidity = pool.GetTotalPoolLiquidity(s.Ctx)
 			positionAfter, err := pool.CalcExitPoolCoinsFromShares(s.Ctx, shares, sdk.ZeroDec())
 			s.Require().NoError(err)
-			spot, err = s.App.GAMMKeeper.CalculateSpotPrice(s.Ctx, poolId, "foo", "adym")
+			spot, err = s.App.GAMMKeeper.CalculateSpotPrice(s.Ctx, poolId, fooDenom, "adym")
 			s.Require().NoError(err)
 			s.T().Logf("positionAfterSwap: %s, liquidity: %s, spot: %s", positionAfter, liquidity, spot)
 

diff --git a/x/rollapp/keeper/keeper.go b/x/rollapp/keeper/keeper.go
@@ -141,6 +141,10 @@ func (k *Keeper) SetCanonicalClientKeeper(kk CanonicalLightClientKeeper) {
 	k.canonicalClientKeeper = kk
 }
 
+func (k *Keeper) SetTransferKeeper(transferKeeper TransferKeeper) {
+	k.transferKeeper = transferKeeper
+}
+
 /* -------------------------------------------------------------------------- */
 /*                                    Hooks                                   */
 /* -------------------------------------------------------------------------- */