fix

gnoswap-labs · Feb 5, 2025 · c7e39a4 · c7e39a4
1 parent 6e2d460
commit c7e39a4
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 49 deletions.
diff --git a/contract/r/gnoswap/position/_helper_test.gno b/contract/r/gnoswap/position/_helper_test.gno
@@ -454,7 +454,7 @@ func LPTokenUnStake(t *testing.T, owner std.Address, positionId uint64, unwrap b
 	sr.UnStakeToken(positionId, unwrap)
 }
 
-func getPoolFromTokenId(t *testing.T, positionId uint64) *pl.Pool {
+func getPoolFromPositionId(t *testing.T, positionId uint64) *pl.Pool {
 	t.Helper()
 	position := MustGetPosition(positionId)
 	return pl.GetPoolFromPoolPath(position.poolKey)

diff --git a/contract/r/gnoswap/position/tests/position_increase_burned_position_test.gnoA b/contract/r/gnoswap/position/tests/position_increase_burned_position_test.gnoA
@@ -60,7 +60,7 @@ func TestIncreaseLiquidity(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, 3678979)
 	foo.Approve(consts.POOL_ADDR, 10000000)
 
-	pool := getPoolFromTokenId(t, uint64(1))
+	pool := getPoolFromPositionId(t, uint64(1))
 	oldLiquidity := pool.Liquidity()
 
 	_, _, m0, m1, _ := IncreaseLiquidity(
@@ -82,7 +82,7 @@ func TestIncreaseLiquidity(t *testing.T) {
 
 func TestDecreaseLiquidity(t *testing.T) {
 	std.TestSetRealm(adminRealm)
-	oldLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	oldLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 
 	DecreaseLiquidity(
 		uint64(1),   // positionId
@@ -93,7 +93,7 @@ func TestDecreaseLiquidity(t *testing.T) {
 		false,       // unwrapResult
 	)
 
-	newLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	newLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 	uassert.Equal(t, true, newLiquidity.Lt(oldLiquidity))
 
 	// check fee left
@@ -129,7 +129,7 @@ func TestIncreaseLiquidityBurnedPosition(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 	foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 
-	pool := getPoolFromTokenId(t, uint64(1))
+	pool := getPoolFromPositionId(t, uint64(1))
 	oldLiquidity := pool.Liquidity()
 
 	position := MustGetPosition(uint64(1))

diff --git a/contract/r/gnoswap/position/tests/position_increase_decrease_test.gnoA b/contract/r/gnoswap/position/tests/position_increase_decrease_test.gnoA
@@ -52,7 +52,7 @@ func TestIncreaseLiquidity(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, 3678979)
 	foo.Approve(consts.POOL_ADDR, 10000000)
 
-	pool := getPoolFromTokenId(t, uint64(1))
+	pool := getPoolFromPositionId(t, uint64(1))
 	oldLiquidity := pool.Liquidity()
 
 	_, _, m0, m1, _ := IncreaseLiquidity(
@@ -158,7 +158,7 @@ func TestSwap2(t *testing.T) {
 
 func TestDecreaseLiquidity(t *testing.T) {
 	std.TestSetRealm(adminRealm)
-	oldLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	oldLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 
 	DecreaseLiquidity(
 		uint64(1),   // positionId
@@ -169,7 +169,7 @@ func TestDecreaseLiquidity(t *testing.T) {
 		false,       // unwrapResult
 	)
 
-	newLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	newLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 	uassert.Equal(t, true, newLiquidity.Lt(oldLiquidity))
 
 	// check fee left
@@ -182,7 +182,7 @@ func TestDecreaseLiquidity(t *testing.T) {
 
 func TestDecreaseLiquidityAllThenAgainShouldPanic(t *testing.T) {
 	std.TestSetRealm(adminRealm)
-	oldLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	oldLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 
 	DecreaseLiquidity(
 		uint64(1),   // positionId
@@ -193,7 +193,7 @@ func TestDecreaseLiquidityAllThenAgainShouldPanic(t *testing.T) {
 		false,       // unwrapResult
 	)
 
-	newLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+	newLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 	uassert.Equal(t, true, newLiquidity.Lt(oldLiquidity))
 	uassert.Equal(t, newLiquidity.ToString(), "0")
 

diff --git a/contract/r/gnoswap/position/tests/position_native_increase_decrease_test.gnoA b/contract/r/gnoswap/position/tests/position_native_increase_decrease_test.gnoA
@@ -100,7 +100,7 @@ func testIncreaseLiquidity(t *testing.T) {
 
 		wugnot.Approve(consts.POSITION_ADDR, consts.UINT64_MAX) // WRAP
 
-		pool := getPoolFromTokenId(t, uint64(1))
+		pool := getPoolFromPositionId(t, uint64(1))
 		oldLiquidity := pool.Liquidity()
 
 		// prepare 10000005ugnot (5 for refund test)
@@ -147,7 +147,7 @@ func testDecreaseLiquidityWrapped(t *testing.T) {
 	t.Run("decrease liquidity wrapped", func(t *testing.T) {
 		std.TestSetRealm(adminRealm)
 
-		oldLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+		oldLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 
 		userWugnotBalance := wugnot.BalanceOf(adminAddr)
 		uassert.Equal(t, userWugnotBalance, uint64(0))
@@ -170,7 +170,7 @@ func testDecreaseLiquidityWrapped(t *testing.T) {
 		userUgnotBalance = ugnotBalanceOf(t, adminAddr) // wrapped result, so ugnot didn't change
 		uassert.Equal(t, uint64(10), userUgnotBalance)
 
-		newLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+		newLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 		uassert.Equal(t, true, newLiquidity.Lt(oldLiquidity))
 
 		// check fee left
@@ -186,7 +186,7 @@ func testDecreaseLiquidityUnwrapped(t *testing.T) {
 	t.Run("decrease liquidity unwrapped", func(t *testing.T) {
 		std.TestSetRealm(adminRealm)
 
-		oldLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+		oldLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 		println("oldLiquidity ", oldLiquidity.ToString())
 
 		userWugnotBalance := wugnot.BalanceOf(adminAddr)
@@ -210,7 +210,7 @@ func testDecreaseLiquidityUnwrapped(t *testing.T) {
 		userUgnotBalance = ugnotBalanceOf(t, adminAddr) // unwrapped result, so ugnot decreased
 		uassert.Equal(t, userUgnotBalance, uint64(24000009))
 
-		newLiquidity := getPoolFromTokenId(t, uint64(1)).Liquidity()
+		newLiquidity := getPoolFromPositionId(t, uint64(1)).Liquidity()
 		uassert.Equal(t, true, newLiquidity.Lt(oldLiquidity))
 
 		// check fee left

diff --git a/contract/r/gnoswap/position/tests/position_reposition_gnot_pair_test.gnoA b/contract/r/gnoswap/position/tests/position_reposition_gnot_pair_test.gnoA
@@ -58,13 +58,6 @@ func ugnotBalanceOf(t *testing.T, addr std.Address) uint64 {
 	return uint64(coins.AmountOf("ugnot"))
 }
 
-func getPoolFromTokenId(t *testing.T, lpTokenId uint64) *pl.Pool {
-	t.Helper()
-
-	position := MustGetPosition(lpTokenId)
-	return pl.GetPoolFromPoolPath(position.poolKey)
-}
-
 func TestRepositionCoinPair(t *testing.T) {
 	testPoolInitCreatePool(t)
 	testMintPosition01InRange(t)
@@ -290,7 +283,7 @@ func testReposition(t *testing.T) {
 		// user ugnot
 		uassert.Equal(t, ugnotBalanceOf(t, adminAddr), uint64(81600118))
 
-		position = MustGetPosition(lpTokenId)
+		position = MustGetPosition(positionId)
 		uassert.Equal(t, position.nonce.ToString(), "0")
 		uassert.Equal(t, position.operator, consts.ZERO_ADDRESS)
 		uassert.Equal(t, position.poolKey, "gno.land/r/demo/wugnot:gno.land/r/gnoswap/v1/gns:500")
@@ -303,7 +296,7 @@ func testReposition(t *testing.T) {
 		uassert.Equal(t, position.tokensOwed1.ToString(), "0")
 		uassert.Equal(t, position.burned, false)
 
-		unclaimedFee0, unclaimedFee1 := unclaimedFee(lpTokenId)
+		unclaimedFee0, unclaimedFee1 := unclaimedFee(positionId)
 		uassert.Equal(t, unclaimedFee0.ToString(), "0")
 		uassert.Equal(t, unclaimedFee1.ToString(), "0")
 	})

diff --git a/contract/r/gnoswap/position/tests/position_tokens_owed_left_grc20_pair_more_action_test.gnoA b/contract/r/gnoswap/position/tests/position_tokens_owed_left_grc20_pair_more_action_test.gnoA
@@ -16,13 +16,6 @@ import (
 	"gno.land/r/onbloc/foo"
 )
 
-func getPoolFromTokenId(t *testing.T, lpTokenId uint64) *pl.Pool {
-	t.Helper()
-
-	position := MustGetPosition(lpTokenId)
-	return pl.GetPoolFromPoolPath(position.poolKey)
-}
-
 const (
 	ugnotDenom string = "ugnot"
 	ugnotPath  string = "ugnot"
@@ -278,7 +271,7 @@ func TestIncreaseLiquidity02(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 	foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 
-	pool := getPoolFromTokenId(t, uint64(2))
+	pool := getPoolFromPositionId(t, uint64(2))
 	oldLiquidity := pool.Liquidity()
 
 	_, _, m0, m1, _ := IncreaseLiquidity(

diff --git a/contract/r/gnoswap/position/tests/position_tokens_owed_left_pair_more_action_exact_test.gnoA b/contract/r/gnoswap/position/tests/position_tokens_owed_left_pair_more_action_exact_test.gnoA
@@ -54,13 +54,6 @@ var (
 	rouRealm   = std.NewCodeRealm(consts.ROUTER_PATH)
 )
 
-func getPoolFromTokenId(t *testing.T, lpTokenId uint64) *pl.Pool {
-	t.Helper()
-
-	position := MustGetPosition(lpTokenId)
-	return pl.GetPoolFromPoolPath(position.poolKey)
-}
-
 func TestPoolInitCreatePool(t *testing.T) {
 	std.TestSetRealm(adminRealm)
 
@@ -320,7 +313,7 @@ func TestIncreaseLiquidity02(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 	foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 
-	pool := getPoolFromTokenId(t, uint64(2))
+	pool := getPoolFromPositionId(t, uint64(2))
 	oldLiquidity := pool.Liquidity()
 
 	_, _, m0, m1, _ := IncreaseLiquidity(
@@ -352,7 +345,7 @@ func TestDecreaseLiquidityPosition02(t *testing.T) {
 	// approve fee0, feelpTokenId to pool
 	bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 	foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
-	oldLiquidities := getPoolFromTokenId(t, positionId).Liquidity()
+	oldLiquidities := getPoolFromPositionId(t, positionId).Liquidity()
 
 	resultPositionId, liquidity, fee0, fee1, amount0, amount1, poolPath := DecreaseLiquidity(
 		positionId,
@@ -401,7 +394,7 @@ func TestDecreaseLiquidityPosition02All(t *testing.T) {
 	bar.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 	foo.Approve(consts.POOL_ADDR, consts.UINT64_MAX)
 
-	oldLiquidities := getPoolFromTokenId(t, positionId).Liquidity()
+	oldLiquidities := getPoolFromPositionId(t, positionId).Liquidity()
 
 	resultPositionId, liquidity, fee0, fee1, amount0, amount1, poolPath := DecreaseLiquidity(
 		positionId,

diff --git a/contract/r/gnoswap/position/tests/position_unclaimed_fee_test.gnoA b/contract/r/gnoswap/position/tests/position_unclaimed_fee_test.gnoA
@@ -47,13 +47,6 @@ var (
 	rouRealm   = std.NewCodeRealm(consts.ROUTER_PATH)
 )
 
-func getPoolFromTokenId(t *testing.T, lpTokenId uint64) *pl.Pool {
-	t.Helper()
-
-	position := MustGetPosition(lpTokenId)
-	return pl.GetPoolFromPoolPath(position.poolKey)
-}
-
 func TestPoolInitCreatePool(t *testing.T) {
 	std.TestSetRealm(adminRealm)