Move mockgen, and minor changes from taker fee feature branch (osmosi…

…s-labs#6196)
likesToEatFish · Aug 28, 2023 · 7f4e83e · 7f4e83e
1 parent 89be360
commit 7f4e83e
Show file tree

Hide file tree

Showing 8 changed files with 171 additions and 11 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ LEDGER_ENABLED ?= true
 SDK_PACK := $(shell go list -m github.com/cosmos/cosmos-sdk | sed  's/ /\@/g')
 BUILDDIR ?= $(CURDIR)/build
 DOCKER := $(shell which docker)
-E2E_UPGRADE_VERSION := "v18"
+E2E_UPGRADE_VERSION := "v19"
 #SHELL := /bin/bash
 
 GO_VERSION := $(shell cat go.mod | grep -E 'go [0-9].[0-9]+' | cut -d ' ' -f 2)
@@ -586,7 +586,7 @@ cl-create-bigbang-config:
 ###############################################################################
 
 go-mock-update:
-	mockgen -source=x/poolmanager/types/routes.go -destination=tests/mocks/pool_module.go -package=mocks
+	mockgen -source=x/poolmanager/types/expected_keepers.go -destination=tests/mocks/pool_module.go -package=mocks
 	mockgen -source=x/poolmanager/types/pool.go -destination=tests/mocks/pool.go -package=mocks
 	mockgen -source=x/gamm/types/pool.go -destination=tests/mocks/cfmm_pool.go -package=mocks
 	mockgen -source=x/concentrated-liquidity/types/cl_pool_extensionI.go -destination=tests/mocks/cl_pool.go -package=mocks

diff --git a/app/upgrades/v18/upgrades.go b/app/upgrades/v18/upgrades.go
@@ -12,7 +12,7 @@ import (
 )
 
 // OSMO / DAI CL pool ID
-const firstCLPoolId = 1066
+const FirstCLPoolId = 1066
 
 func CreateUpgradeHandler(
 	mm *module.Manager,
@@ -28,7 +28,7 @@ func CreateUpgradeHandler(
 			return nil, err
 		}
 
-		for id := 1; id < firstCLPoolId; id++ {
+		for id := 1; id < FirstCLPoolId; id++ {
 			resetSumtree(keepers, ctx, uint64(id))
 		}
 		return migrations, nil

diff --git a/app/upgrades/v18/upgrades_test.go b/app/upgrades/v18/upgrades_test.go
@@ -106,6 +106,7 @@ func (s *UpgradeTestSuite) TestUpgrade() {
 
 	// Swap
 	toSwap := sdk.NewCoin(pool.GetToken0(), sdk.NewInt(100))
+	s.FundAcc(s.TestAccs[0], sdk.NewCoins(toSwap))
 	_, err = s.App.ConcentratedLiquidityKeeper.SwapExactAmountIn(s.Ctx, s.TestAccs[0], updatedCLPool, toSwap, pool.GetToken1(), sdk.NewInt(1), sdk.ZeroDec())
 	s.Require().NoError(err)
 
@@ -233,7 +234,7 @@ func (suite *UpgradeTestSuite) ensurePreUpgradeDistributionPanics() {
 	suite.App.ConcentratedLiquidityKeeper.SetParams(suite.Ctx, clParams)
 
 	// prepare CL pool with the same denom as pool 3, which is the pool we are testing with
-	clPool := suite.PrepareConcentratedPoolWithCoins(v17.OSMO, v17.AKTIBCDenom)
+	clPool := suite.PrepareConcentratedPoolWithCoins(v17.AKTIBCDenom, v17.OSMO)
 	balancerToCLPoolLink := []gammmigration.BalancerToConcentratedPoolLink{
 		{
 			BalancerPoolId: 3,

diff --git a/tests/mocks/cfmm_pool.go b/tests/mocks/cfmm_pool.go
diff --git a/tests/mocks/cl_pool.go b/tests/mocks/cl_pool.go
diff --git a/tests/mocks/pool.go b/tests/mocks/pool.go
diff --git a/tests/mocks/pool_module.go b/tests/mocks/pool_module.go
diff --git a/x/concentrated-liquidity/model/pool_test.go b/x/concentrated-liquidity/model/pool_test.go
@@ -141,7 +141,7 @@ func (s *ConcentratedPoolTestSuite) TestString() {
 	pool, err := model.NewConcentratedLiquidityPool(1, "foo", "bar", DefaultTickSpacing, DefaultSpreadFactor)
 	s.Require().NoError(err)
 	poolString := pool.String()
-	s.Require().Equal(poolString, "{\"address\":\"osmo19e2mf7cywkv7zaug6nk5f87d07fxrdgrladvymh2gwv5crvm3vnsuewhh7\",\"incentives_address\":\"osmo156gncm3w2hdvuxxaejue8nejxgdgsrvdf7jftntuhxnaarhxcuas4ywjxf\",\"spread_rewards_address\":\"osmo10t3u6ze74jn7et6rluuxyf9vr2arykewmhcx67svg6heuu0gte2syfudcv\",\"id\":1,\"current_tick_liquidity\":\"0.000000000000000000\",\"token0\":\"foo\",\"token1\":\"bar\",\"current_sqrt_price\":\"0.000000000000000000000000000000000000\",\"tick_spacing\":1,\"exponent_at_price_one\":-6,\"spread_factor\":\"0.010000000000000000\",\"last_liquidity_update\":\"0001-01-01T00:00:00Z\"}")
+	s.Require().Equal("{\"address\":\"osmo19e2mf7cywkv7zaug6nk5f87d07fxrdgrladvymh2gwv5crvm3vnsuewhh7\",\"incentives_address\":\"osmo156gncm3w2hdvuxxaejue8nejxgdgsrvdf7jftntuhxnaarhxcuas4ywjxf\",\"spread_rewards_address\":\"osmo10t3u6ze74jn7et6rluuxyf9vr2arykewmhcx67svg6heuu0gte2syfudcv\",\"id\":1,\"current_tick_liquidity\":\"0.000000000000000000\",\"token0\":\"foo\",\"token1\":\"bar\",\"current_sqrt_price\":\"0.000000000000000000000000000000000000\",\"tick_spacing\":1,\"exponent_at_price_one\":-6,\"spread_factor\":\"0.010000000000000000\",\"last_liquidity_update\":\"0001-01-01T00:00:00Z\"}", poolString)
 }
 
 // TestSpotPrice tests the SpotPrice method of the ConcentratedPoolTestSuite.