From eb718bd7022586e5ef7f89471a8cd82ae233acbc Mon Sep 17 00:00:00 2001 From: stackman27 Date: Wed, 17 May 2023 13:01:07 -0700 Subject: [PATCH] fixed ci --- x/concentrated-liquidity/swaps.go | 6 +++--- x/concentrated-liquidity/types/errors.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/x/concentrated-liquidity/swaps.go b/x/concentrated-liquidity/swaps.go index f06e56f476e..a64b2b80bc8 100644 --- a/x/concentrated-liquidity/swaps.go +++ b/x/concentrated-liquidity/swaps.go @@ -462,7 +462,7 @@ func (k Keeper) computeInAmtGivenOut( // take provided price limit and turn this into a sqrt price limit since formulas use sqrtPrice sqrtPriceLimit, err := priceLimit.ApproxSqrt() if err != nil { - return writeCtx, sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, types.SqrtRootCalculationError{SqrtPriceLimit: sqrtPriceLimit} + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, types.SqrtRootCalculationError{SqrtPriceLimit: sqrtPriceLimit} } // set the swap strategy @@ -511,13 +511,13 @@ func (k Keeper) computeInAmtGivenOut( // if no ticks are initialized (no users have created liquidity positions) then we return an error nextTick, ok := swapStrategy.NextInitializedTick(ctx, poolId, swapState.tick) if !ok { - return writeCtx, sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, types.InvalidTickError{} + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, types.InvalidTickError{} } // utilizing the next initialized tick, we find the corresponding nextPrice (the target price) _, sqrtPriceNextTick, err := math.TickToSqrtPrice(nextTick) if err != nil { - return writeCtx, sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, types.TickToSqrtPriceConversionError{NextTick: nextTick} + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, types.TickToSqrtPriceConversionError{NextTick: nextTick} } sqrtPriceTarget := swapStrategy.GetSqrtTargetPrice(sqrtPriceNextTick) diff --git a/x/concentrated-liquidity/types/errors.go b/x/concentrated-liquidity/types/errors.go index 9d206d3f2f5..0cd18a39c91 100644 --- a/x/concentrated-liquidity/types/errors.go +++ b/x/concentrated-liquidity/types/errors.go @@ -817,7 +817,7 @@ func (e SqrtRootCalculationError) Error() string { } type TickToSqrtPriceConversionError struct { - NextTick sdk.Int + NextTick int64 } func (e TickToSqrtPriceConversionError) Error() string {