From 6e2d46074b2947f078c7b2fbb916cb69e48e15fe Mon Sep 17 00:00:00 2001 From: Lee ByeongJun Date: Wed, 5 Feb 2025 16:49:54 +0900 Subject: [PATCH] tid -> positionIdFrom --- ...p_tier_total_4_position_internal_only_test.gnoA | 8 ++++---- ...up_tier_total_4_position_two_external_test.gnoA | 8 ++++---- ..._liquidity_and_in_range_chane_by_swap_test.gnoA | 10 +++++----- .../short_warmup_internal_gnot_gns_3000_test.gnoA | 4 ++-- .../staker/tests/staker_NFT_transfer_01_test.gnoA | 12 ++++++------ .../staker/tests/staker_NFT_transfer_03_test.gnoA | 8 ++++---- .../staker_native_create_collect_unstake_test.gnoA | 14 +++++++------- ...taker_short_warmup_period_external_10_test.gnoA | 4 ++-- ...taker_short_warmup_period_external_12_test.gnoA | 2 +- ...r_short_warmup_period_external_15_90d_test.gnoA | 8 ++++---- ..._short_warmup_period_external_16_180d_test.gnoA | 8 ++++---- ..._short_warmup_period_external_17_365d_test.gnoA | 8 ++++---- ...position_in_out_range_changed_by_swap_test.gnoA | 4 ++-- ...riod_internal_gns_and_external_gns_90_test.gnoA | 4 ++-- 14 files changed, 51 insertions(+), 51 deletions(-) diff --git a/contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA b/contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA index 3f523d75..193ecb19 100644 --- a/contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA +++ b/contract/r/gnoswap/staker/tests/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA @@ -172,7 +172,7 @@ func testStakeTokenPos01(t *testing.T) { t.Run("stake position 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1) }) @@ -283,14 +283,14 @@ func testStakeTokenPos02To04(t *testing.T) { t.Run("stake position 02", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(2)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(2)) StakeToken(2) }) t.Run("stake position 03", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(3)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(3)) StakeToken(3) std.TestSkipHeights(1) }) @@ -298,7 +298,7 @@ func testStakeTokenPos02To04(t *testing.T) { t.Run("stake position 04", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(4)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(4)) StakeToken(4) std.TestSkipHeights(1) }) diff --git a/contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA b/contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA index 859f1d04..ca41b07e 100644 --- a/contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA +++ b/contract/r/gnoswap/staker/tests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA @@ -214,7 +214,7 @@ func testStakeTokenPos01ToWarmUp100(t *testing.T) { t.Run("stake position 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1) }) @@ -335,7 +335,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30(t *testing.T) t.Run("stake position 02", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(2)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(2)) StakeToken(2) std.TestSkipHeights(432001) // 70% }) @@ -343,7 +343,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30(t *testing.T) t.Run("stake position 03", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(3)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(3)) StakeToken(3) std.TestSkipHeights(216001) // 50% }) @@ -351,7 +351,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30(t *testing.T) t.Run("stake position 04", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(4)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(4)) StakeToken(4) std.TestSkipHeights(1) // 30% }) diff --git a/contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA b/contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA index fbbda24e..a9a19a39 100644 --- a/contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA +++ b/contract/r/gnoswap/staker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA @@ -205,7 +205,7 @@ func testStakeTokenPos01(t *testing.T) { t.Run("stake position 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) // make it warm up 100% @@ -217,7 +217,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30_Pos05(t *test t.Run("stake position 02", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(2)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(2)) StakeToken(2) std.TestSkipHeights(432001) // 70% }) @@ -225,7 +225,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30_Pos05(t *test t.Run("stake position 03", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(3)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(3)) StakeToken(3) std.TestSkipHeights(216001) // 50% }) @@ -233,7 +233,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30_Pos05(t *test t.Run("stake position 04", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(4)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(4)) StakeToken(4) // (out of range, will become in-range by swap) std.TestSkipHeights(1) // 30% }) @@ -241,7 +241,7 @@ func testStakeTokenPos02ToWarmUp70_Pos03ToWarmUp50_Pos04ToWarmUp30_Pos05(t *test t.Run("stake position 05", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(5)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(5)) StakeToken(5) // (out of range forever) std.TestSkipHeights(1) // 30% }) diff --git a/contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA b/contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA index 3cce05b0..84de7eca 100644 --- a/contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA +++ b/contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA @@ -97,7 +97,7 @@ func testMintWugnotGnsPos01(t *testing.T) { ) uassert.Equal(t, positionId, uint64(1)) - uassert.Equal(t, gnft.MustOwnerOf(tid(positionId)), adminAddr) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(positionId)), adminAddr) std.TestSkipHeights(1) // 1 block minted @@ -109,7 +109,7 @@ func testStakeToken01(t *testing.T) { t.Run("stake token 1", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1) // 1 block staked diff --git a/contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA index bd68154a..9316c6c6 100644 --- a/contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA @@ -111,7 +111,7 @@ func testPositionMint01(t *testing.T) { std.TestSkipHeights(1) uassert.Equal(t, lpTokenId, uint64(1)) - owner, _ := gnft.OwnerOf(tid(lpTokenId)) + owner, _ := gnft.OwnerOf(positionIdFrom(lpTokenId)) uassert.Equal(t, owner, admin) uassert.Equal(t, amount0, "368") uassert.Equal(t, amount1, "1000") @@ -123,13 +123,13 @@ func testStakeToken01(t *testing.T) { std.TestSetRealm(adminRealm) // approve nft to staker - gnft.Approve(consts.STAKER_ADDR, tid(uint64(1))) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(uint64(1))) std.TestSkipHeights(1) StakeToken(uint64(1)) // GNFT tokenId std.TestSkipHeights(1) - owner, _ := gnft.OwnerOf(tid(1)) + owner, _ := gnft.OwnerOf(positionIdFrom(1)) uassert.Equal(t, owner, consts.STAKER_ADDR) uassert.Equal(t, deposits.Size(), 1) }) @@ -145,7 +145,7 @@ func testTransferNft(t *testing.T) { `[GNOSWAP-GNFT-001] caller has no permission || caller (g1v36k6mteta047h6lta047h6lta047h6lz7gmv8) is not the owner or operator of token (1)`, func() { std.TestSetRealm(std.NewUserRealm(dummyAddr)) - gnft.TransferFrom(admin, dummyAddr, tid(uint64(1))) + gnft.TransferFrom(admin, dummyAddr, positionIdFrom(uint64(1))) }, ) }) @@ -156,12 +156,12 @@ func testTransferNft(t *testing.T) { `[GNOSWAP-GNFT-001] caller has no permission || caller (g17290cwvmrapvp869xfnhhawa8sm9edpufzat7d) is not the owner or operator of token (1)`, func() { std.TestSetRealm(adminRealm) - gnft.TransferFrom(consts.STAKER_ADDR, dummyAddr, tid(uint64(1))) + gnft.TransferFrom(consts.STAKER_ADDR, dummyAddr, positionIdFrom(uint64(1))) }, ) }) - gnft.TransferFrom(consts.STAKER_ADDR, dummyAddr, tid(uint64(1))) + gnft.TransferFrom(consts.STAKER_ADDR, dummyAddr, positionIdFrom(uint64(1))) }) } diff --git a/contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA index c62e1a61..c8bfb668 100644 --- a/contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA @@ -117,7 +117,7 @@ func testPositionMint01(t *testing.T) { std.TestSkipHeights(1) uassert.Equal(t, lpTokenId, uint64(1)) - owner, _ := gnft.OwnerOf(tid(lpTokenId)) + owner, _ := gnft.OwnerOf(positionIdFrom(lpTokenId)) uassert.Equal(t, owner, admin) uassert.Equal(t, amount0, "368") uassert.Equal(t, amount1, "1000") @@ -132,12 +132,12 @@ func testTransferNft(t *testing.T) { t, func() { std.TestSetRealm(adminRealm) - gnft.TransferFrom(admin, dummyAddr, tid(uint64(1))) + gnft.TransferFrom(admin, dummyAddr, positionIdFrom(uint64(1))) }, `should not panic`, ) - owner, _ := gnft.OwnerOf(tid(uint64(1))) + owner, _ := gnft.OwnerOf(positionIdFrom(uint64(1))) uassert.Equal(t, owner.String(), dummyAddr.String()) }) }) @@ -157,7 +157,7 @@ func testStakeToken01(t *testing.T) { t.Run("dummyAddr(new owner) can stake", func(t *testing.T) { std.TestSetRealm(dummyRealm) - gnft.Approve(consts.STAKER_ADDR, tid(uint64(1))) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(uint64(1))) uassert.NotPanics( t, diff --git a/contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA b/contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA index 6707ff8c..61a2f908 100644 --- a/contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA @@ -114,7 +114,7 @@ func testPositionMintNative01(t *testing.T) { std.TestSkipHeights(1) uassert.Equal(t, lpTokenId, uint64(1)) - uassert.Equal(t, gnft.MustOwnerOf(tid(lpTokenId)), adminAddr) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(lpTokenId)), adminAddr) uassert.Equal(t, amount0, "1000") uassert.Equal(t, amount1, "368") }) @@ -164,7 +164,7 @@ func testPositionMintNative02(t *testing.T) { std.TestSkipHeights(1) uassert.Equal(t, lpTokenId, uint64(2)) - uassert.Equal(t, gnft.MustOwnerOf(tid(lpTokenId)), adminAddr) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(lpTokenId)), adminAddr) uassert.Equal(t, amount0, "1000") uassert.Equal(t, amount1, "368") }) @@ -215,14 +215,14 @@ func testStakeToken01(t *testing.T) { t.Run("stake token 01", func(t *testing.T) { // approve nft to staker for staking std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) std.TestSkipHeights(1) StakeToken(1) // GNFT tokenId std.TestSkipHeights(1) - uassert.Equal(t, gnft.MustOwnerOf(tid(1)), consts.STAKER_ADDR) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(1)), consts.STAKER_ADDR) uassert.Equal(t, deposits.Size(), 1) }) } @@ -231,14 +231,14 @@ func testStakeToken02(t *testing.T) { t.Run("stake token 02", func(t *testing.T) { // approve nft to staker for staking std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(2)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(2)) std.TestSkipHeights(1) StakeToken(2) // GNFT tokenId std.TestSkipHeights(1) - uassert.Equal(t, gnft.MustOwnerOf(tid(2)), consts.STAKER_ADDR) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(2)), consts.STAKER_ADDR) uassert.Equal(t, deposits.Size(), 2) }) } @@ -272,7 +272,7 @@ func testUnstakeToken02(t *testing.T) { UnStakeToken(2, false) // GNFT tokenId std.TestSkipHeights(1) - uassert.Equal(t, gnft.MustOwnerOf(tid(2)), adminAddr) + uassert.Equal(t, gnft.MustOwnerOf(positionIdFrom(2)), adminAddr) uassert.Equal(t, wugnot.BalanceOf(admin), uint64(622937)) uassert.Equal(t, ugnotBalanceOf(t, adminAddr), uint64(99998010)) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA index e8d0963d..f599e766 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA @@ -115,7 +115,7 @@ func testStakeToken_1(t *testing.T) { t.Run("stake token 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1) @@ -201,7 +201,7 @@ func testStakeToken_2(t *testing.T) { t.Run("stake token 02", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(2)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(2)) StakeToken(2) std.TestSkipHeights(1) }) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA index 515cc11b..46879397 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA @@ -135,7 +135,7 @@ func testStakeToken_1(t *testing.T) { t.Run("stake token 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(GetOrigPkgAddr(), tid(1)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA index 69ee56be..0feb8945 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA @@ -121,16 +121,16 @@ func testStakeToken_1_4(t *testing.T) { t.Run("stake token 1 ~ 4", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(GetOrigPkgAddr(), tid(1)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(1)) StakeToken(1) - gnft.Approve(GetOrigPkgAddr(), tid(2)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(2)) StakeToken(2) - gnft.Approve(GetOrigPkgAddr(), tid(3)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(3)) StakeToken(3) - gnft.Approve(GetOrigPkgAddr(), tid(4)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(4)) StakeToken(4) std.TestSkipHeights(1) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA index c5a9875e..31536443 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA @@ -121,16 +121,16 @@ func testStakeToken_1_4(t *testing.T) { t.Run("stake token 1 ~ 4", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(GetOrigPkgAddr(), tid(1)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(1)) StakeToken(1) - gnft.Approve(GetOrigPkgAddr(), tid(2)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(2)) StakeToken(2) - gnft.Approve(GetOrigPkgAddr(), tid(3)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(3)) StakeToken(3) - gnft.Approve(GetOrigPkgAddr(), tid(4)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(4)) StakeToken(4) std.TestSkipHeights(1) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA index e3efda4b..edf70cbd 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA @@ -115,16 +115,16 @@ func testStakeToken_1_4(t *testing.T) { t.Run("stake token 1 ~ 4", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(GetOrigPkgAddr(), tid(1)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(1)) StakeToken(1) - gnft.Approve(GetOrigPkgAddr(), tid(2)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(2)) StakeToken(2) - gnft.Approve(GetOrigPkgAddr(), tid(3)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(3)) StakeToken(3) - gnft.Approve(GetOrigPkgAddr(), tid(4)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(4)) StakeToken(4) std.TestSkipHeights(1) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA index 82cd7a68..2e9cd902 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA @@ -121,10 +121,10 @@ func testStakeToken_1_2(t *testing.T) { t.Run("stake position 01, 02", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(GetOrigPkgAddr(), tid(1)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(1)) StakeToken(1) - gnft.Approve(GetOrigPkgAddr(), tid(2)) + gnft.Approve(GetOrigPkgAddr(), positionIdFrom(2)) StakeToken(2) std.TestSkipHeights(1) diff --git a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA index 4e8519f7..181e0b97 100644 --- a/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA +++ b/contract/r/gnoswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA @@ -93,7 +93,7 @@ func testMintBarQux100_1(t *testing.T) { ) uassert.Equal(t, positionId, uint64(1)) - owner, err := gnft.OwnerOf(tid(positionId)) + owner, err := gnft.OwnerOf(positionIdFrom(positionId)) uassert.NoError(t, err) uassert.Equal(t, owner, admin) @@ -141,7 +141,7 @@ func testStakeToken_1(t *testing.T) { t.Run("stake token 01", func(t *testing.T) { std.TestSetRealm(adminRealm) - gnft.Approve(consts.STAKER_ADDR, tid(1)) + gnft.Approve(consts.STAKER_ADDR, positionIdFrom(1)) StakeToken(1) std.TestSkipHeights(1)