Revert "add back TicksToSqrtPrices"

This reverts commit 50410c4.
osmosis-labs · Jan 11, 2023 · 794e3b1 · 794e3b1
1 parent 50410c4
commit 794e3b1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/x/concentrated-liquidity/internal/math/tick.go b/x/concentrated-liquidity/internal/math/tick.go
@@ -15,7 +15,7 @@ var sdkTenDec = sdk.NewDec(10)
 // TicksToPrice returns the price for the lower and upper ticks.
 // Returns error if fails to calculate price.
 // TODO: spec and tests
-func TicksToSqrtPrice(lowerTick, upperTick int64, exponentAtPriceOne sdk.Int) (sdk.Dec, sdk.Dec, error) {
+func TicksToPrice(lowerTick, upperTick int64, exponentAtPriceOne sdk.Int) (sdk.Dec, sdk.Dec, error) {
 	priceUpperTick, err := TickToPrice(sdk.NewInt(upperTick), exponentAtPriceOne)
 	if err != nil {
 		return sdk.Dec{}, sdk.Dec{}, err
@@ -24,15 +24,7 @@ func TicksToSqrtPrice(lowerTick, upperTick int64, exponentAtPriceOne sdk.Int) (s
 	if err != nil {
 		return sdk.Dec{}, sdk.Dec{}, err
 	}
-	sqrtPriceUpperTick, err := priceLowerTick.ApproxSqrt()
-	if err != nil {
-		return sdk.Dec{}, sdk.Dec{}, err
-	}
-	sqrtPriceLowerTick, err := priceUpperTick.ApproxSqrt()
-	if err != nil {
-		return sdk.Dec{}, sdk.Dec{}, err
-	}
-	return sqrtPriceLowerTick, sqrtPriceUpperTick, nil
+	return priceLowerTick, priceUpperTick, nil
 }
 
 // TickToPrice returns the price given the following two arguments:

diff --git a/x/concentrated-liquidity/lp.go b/x/concentrated-liquidity/lp.go
@@ -32,8 +32,18 @@ func (k Keeper) createPosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddr
 		return sdk.Int{}, sdk.Int{}, sdk.Dec{}, err
 	}
 
-	// Transform the provided ticks into their corresponding sqrt prices.
-	sqrtPriceLowerTick, sqrtPriceUpperTick, err := math.TicksToSqrtPrice(lowerTick, upperTick, pool.GetPrecisionFactorAtPriceOne())
+	// Transform the provided ticks into their corresponding prices.
+	priceLowerTick, priceUpperTick, err := math.TicksToPrice(lowerTick, upperTick, pool.GetPrecisionFactorAtPriceOne())
+	if err != nil {
+		return sdk.Int{}, sdk.Int{}, sdk.Dec{}, err
+	}
+
+	// Transform the provided prices into their corresponding square root prices.
+	sqrtPriceLowerTick, err := priceLowerTick.ApproxSqrt()
+	if err != nil {
+		return sdk.Int{}, sdk.Int{}, sdk.Dec{}, err
+	}
+	sqrtPriceUpperTick, err := priceUpperTick.ApproxSqrt()
 	if err != nil {
 		return sdk.Int{}, sdk.Int{}, sdk.Dec{}, err
 	}
@@ -170,8 +180,18 @@ func (k Keeper) updatePosition(ctx sdk.Context, poolId uint64, owner sdk.AccAddr
 		return sdk.Int{}, sdk.Int{}, err
 	}
 
-	// Transform the provided ticks into their corresponding sqrt prices.
-	sqrtPriceLowerTick, sqrtPriceUpperTick, err := math.TicksToSqrtPrice(lowerTick, upperTick, pool.GetPrecisionFactorAtPriceOne())
+	// Transform the provided ticks into their corresponding prices.
+	priceLowerTick, priceUpperTick, err := math.TicksToPrice(lowerTick, upperTick, pool.GetPrecisionFactorAtPriceOne())
+	if err != nil {
+		return sdk.Int{}, sdk.Int{}, err
+	}
+
+	// Transform the provided prices into their corresponding square root prices.
+	sqrtPriceLowerTick, err := priceLowerTick.ApproxSqrt()
+	if err != nil {
+		return sdk.Int{}, sdk.Int{}, err
+	}
+	sqrtPriceUpperTick, err := priceUpperTick.ApproxSqrt()
 	if err != nil {
 		return sdk.Int{}, sdk.Int{}, err
 	}