From b69e58781e7c4021b5070b372b56bf956b4ea898 Mon Sep 17 00:00:00 2001 From: Roman Date: Tue, 16 May 2023 22:44:51 -0400 Subject: [PATCH] fix: merge conflict --- x/concentrated-liquidity/swaps.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/x/concentrated-liquidity/swaps.go b/x/concentrated-liquidity/swaps.go index 2de067af80e..5e799632aa8 100644 --- a/x/concentrated-liquidity/swaps.go +++ b/x/concentrated-liquidity/swaps.go @@ -257,10 +257,10 @@ func (k Keeper) computeOutAmtGivenIn( hasPositionInPool, err := k.HasAnyPositionForPool(ctx, poolId) if err != nil { - return sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, err + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, err } if !hasPositionInPool { - return sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, types.NoSpotPriceWhenNoLiquidityError{PoolId: poolId} + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, types.NoSpotPriceWhenNoLiquidityError{PoolId: poolId} } asset0 := p.GetToken0() @@ -435,10 +435,10 @@ func (k Keeper) computeInAmtGivenOut( hasPositionInPool, err := k.HasAnyPositionForPool(ctx, poolId) if err != nil { - return writeCtx, sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, err + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, err } if !hasPositionInPool { - return writeCtx, sdk.Coin{}, sdk.Coin{}, sdk.Int{}, sdk.Dec{}, sdk.Dec{}, types.NoSpotPriceWhenNoLiquidityError{PoolId: poolId} + return sdk.Coin{}, sdk.Coin{}, 0, sdk.Dec{}, sdk.Dec{}, types.NoSpotPriceWhenNoLiquidityError{PoolId: poolId} } asset0 := p.GetToken0()