refactored where validate permissionless is checked

x/concentrated-liquidity/keeper.go

@@ -120,11 +120,11 @@ func (k *Keeper) SetListeners(listeners types.ConcentratedLiquidityListeners) *K
 
 // ValidatePermissionlessPoolCreationEnabled returns nil if permissionless pool creation in the module is enabled.
 // Otherwise, returns an error.
-func (k Keeper) ValidatePermissionlessPoolCreationEnabled(ctx sdk.Context) error {
+func (k Keeper) ValidatePermissionlessPoolCreationEnabled(ctx sdk.Context) bool {
 	if !k.GetParams(ctx).IsPermissionlessPoolCreationEnabled {
-		return types.ErrPermissionlessPoolCreationDisabled
+		return false
 	}
-	return nil
+	return true
 }
 
 // GetAuthorizedQuoteDenoms gets the authorized quote denoms from the poolmanager keeper.

x/concentrated-liquidity/keeper_test.go

@@ -433,15 +433,15 @@ func (s *KeeperTestSuite) AddBlockTime(timeToAdd time.Duration) {
 func (s *KeeperTestSuite) TestValidatePermissionlessPoolCreationEnabled() {
 	// Normally, by default, permissionless pool creation is disabled.
 	// SetupTest, however, calls SetupConcentratedLiquidityDenomsAndPoolCreation which enables permissionless pool creation.
-	s.Require().NoError(s.App.ConcentratedLiquidityKeeper.ValidatePermissionlessPoolCreationEnabled(s.Ctx))
+	s.Require().True(s.App.ConcentratedLiquidityKeeper.ValidatePermissionlessPoolCreationEnabled(s.Ctx))
 
 	// Disable permissionless pool creation.
 	defaultParams := types.DefaultParams()
 	defaultParams.IsPermissionlessPoolCreationEnabled = false
 	s.App.ConcentratedLiquidityKeeper.SetParams(s.Ctx, defaultParams)
 
 	// Validate that permissionless pool creation is disabled.
-	s.Require().Error(s.App.ConcentratedLiquidityKeeper.ValidatePermissionlessPoolCreationEnabled(s.Ctx))
+	s.Require().False(s.App.ConcentratedLiquidityKeeper.ValidatePermissionlessPoolCreationEnabled(s.Ctx))
 }
 
 func (s *KeeperTestSuite) runMultipleAuthorizedUptimes(tests func()) {

x/concentrated-liquidity/pool.go

@@ -64,6 +64,10 @@ func (k Keeper) InitializePool(ctx sdk.Context, poolI poolmanagertypes.PoolI, cr
 	}
 
 	if !bypassRestrictions {
+		if !k.ValidatePermissionlessPoolCreationEnabled(ctx) {
+			return types.ErrPermissionlessPoolCreationDisabled
+		}
+
 		if !k.validateTickSpacing(params, tickSpacing) {
 			return types.UnauthorizedTickSpacingError{ProvidedTickSpacing: tickSpacing, AuthorizedTickSpacings: params.AuthorizedTickSpacing}
 		}

x/cosmwasmpool/pool_module.go

@@ -362,12 +362,6 @@ func (k Keeper) CalcInAmtGivenOut(
 	return response.TokenIn, nil
 }
 
-// ValidatePermissionlessPoolCreationEnabled returns nil if permissionless pool creation in the module is enabled.
-// Otherwise, returns an error.
-func (k Keeper) ValidatePermissionlessPoolCreationEnabled(ctx sdk.Context) error {
-	return nil
-}
-
 // GetTotalPoolLiquidity retrieves the total liquidity of a specific pool identified by poolId.
 //
 // Parameters:

x/gamm/keeper/keeper.go

@@ -93,12 +93,6 @@ func (k Keeper) setParams(ctx sdk.Context, params types.Params) {
 	k.paramSpace.SetParamSet(ctx, &params)
 }
 
-// ValidatePermissionlessPoolCreationEnabled returns nil if permissionless pool creation in the module is enabled.
-// Pools in gamm module have permissionless pool creation enabled, thus always return nil.
-func (k Keeper) ValidatePermissionlessPoolCreationEnabled(ctx sdk.Context) error {
-	return nil
-}
-
 // Set the pool incentives keeper.
 func (k *Keeper) SetPoolIncentivesKeeper(poolIncentivesKeeper types.PoolIncentivesKeeper) {
 	k.poolIncentivesKeeper = poolIncentivesKeeper

x/poolmanager/create_pool.go

@@ -30,18 +30,14 @@ func (k Keeper) validateCreatedPool(poolId uint64, pool types.PoolI) error {
 // - Minting LP shares to pool creator
 // - Setting metadata for the shares
 func (k Keeper) CreatePool(ctx sdk.Context, msg types.CreatePoolMsg) (uint64, error) {
-	// Get pool module interface from the pool type.
+	// Check that the pool type exists
+	// TODO: see if we can get rid of this check
 	poolType := msg.GetPoolType()
-	poolModule, ok := k.routes[poolType]
+	_, ok := k.routes[poolType]
 	if !ok {
 		return 0, types.InvalidPoolTypeError{PoolType: poolType}
 	}
 
-	// Confirm that permissionless pool creation is enabled for the module.
-	if err := poolModule.ValidatePermissionlessPoolCreationEnabled(ctx); err != nil {
-		return 0, err
-	}
-
 	// createPoolZeroLiquidityNoCreationFee contains shared pool creation logic between this function (CreatePool) and
 	// CreateConcentratedPoolAsPoolManager. Despite the name, within this (CreatePool) function, we do charge a creation
 	// fee and send initial liquidity to the pool's address. createPoolZeroLiquidityNoCreationFee is strictly used to reduce code duplication.
@@ -57,6 +53,8 @@ func (k Keeper) CreatePool(ctx sdk.Context, msg types.CreatePoolMsg) (uint64, er
 		return 0, err
 	}
 
+	// TODO see what happens if this is called for gamm
+
 	// Send initial liquidity from pool creator to pool module account.
 	initialPoolLiquidity := msg.InitialLiquidity()
 	err = k.bankKeeper.SendCoins(ctx, sender, pool.GetAddress(), initialPoolLiquidity)

x/poolmanager/types/expected_keepers.go

@@ -91,10 +91,6 @@ type PoolModuleI interface {
 	// GetTotalPoolLiquidity returns the coins in the pool owned by all LPs
 	GetTotalPoolLiquidity(ctx sdk.Context, poolId uint64) (sdk.Coins, error)
 
-	// ValidatePermissionlessPoolCreationEnabled returns nil if permissionless pool creation in the module is enabled.
-	// Otherwise, returns an error.
-	ValidatePermissionlessPoolCreationEnabled(ctx sdk.Context) error
-
 	// GetTotalLiquidity returns the total liquidity of all the pools in the module.
 	GetTotalLiquidity(ctx sdk.Context) (sdk.Coins, error)
 }