cleanup

osmosis-labs · Jul 31, 2023 · f10f334 · f10f334
1 parent ec34dab
commit f10f334
Show file tree

Hide file tree

Showing 18 changed files with 1,032 additions and 466 deletions.
diff --git a/app/upgrades/v16/concentrated_pool.go b/app/upgrades/v16/concentrated_pool.go
diff --git a/app/upgrades/v16/concentrated_pool_test.go b/app/upgrades/v16/concentrated_pool_test.go
diff --git a/app/upgrades/v16/export_test.go b/app/upgrades/v16/export_test.go
@@ -2,12 +2,7 @@ package v16
 
 import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 
-	"github.com/osmosis-labs/osmosis/v17/app/keepers"
-	gammkeeper "github.com/osmosis-labs/osmosis/v17/x/gamm/keeper"
-	"github.com/osmosis-labs/osmosis/v17/x/poolmanager"
-	poolmanagertypes "github.com/osmosis-labs/osmosis/v17/x/poolmanager/types"
 	tokenfactorykeeper "github.com/osmosis-labs/osmosis/v17/x/tokenfactory/keeper"
 )
 
@@ -16,14 +11,6 @@ var (
 	AuthorizedUptimes     = authorizedUptimes
 )
 
-func CreateConcentratedPoolFromCFMM(ctx sdk.Context, cfmmPoolIdToLinkWith uint64, desiredDenom0 string, accountKeeper authkeeper.AccountKeeper, gammKeeper gammkeeper.Keeper, poolmanagerKeeper poolmanager.Keeper) (poolmanagertypes.PoolI, error) {
-	return createConcentratedPoolFromCFMM(ctx, cfmmPoolIdToLinkWith, desiredDenom0, accountKeeper, gammKeeper, poolmanagerKeeper)
-}
-
-func CreateCanonicalConcentratedLiquidityPoolAndMigrationLink(ctx sdk.Context, cfmmPoolId uint64, desiredDenom0 string, keepers *keepers.AppKeepers) (poolmanagertypes.PoolI, error) {
-	return createCanonicalConcentratedLiquidityPoolAndMigrationLink(ctx, cfmmPoolId, desiredDenom0, keepers)
-}
-
 func UpdateTokenFactoryParams(ctx sdk.Context, tokenFactoryKeeper *tokenfactorykeeper.Keeper) {
 	updateTokenFactoryParams(ctx, tokenFactoryKeeper)
 }
diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go
@@ -123,7 +123,7 @@ func CreateUpgradeHandler(
 
 		// Create a concentrated liquidity pool for DAI/OSMO.
 		// Link the DAI/OSMO balancer pool to the cl pool.
-		clPool, err := createCanonicalConcentratedLiquidityPoolAndMigrationLink(ctx, DaiOsmoPoolId, DesiredDenom0, keepers)
+		clPool, err := keepers.GAMMKeeper.CreateCanonicalConcentratedLiquidityPoolAndMigrationLink(ctx, DaiOsmoPoolId, DesiredDenom0, TickSpacing)
 		if err != nil {
 			return nil, err
 		}