Skip to content

Commit

Permalink
tid -> positionIdFrom
Browse files Browse the repository at this point in the history
  • Loading branch information
@notJoon
notJoon committed Feb 5, 2025
1 parent 43108c7 commit 6e2d460
Show file tree
Hide file tree
Showing 14 changed files with 51 additions and 51 deletions.
8 changes: 4 additions & 4 deletions ...sts/more_01_single_position_for_each_warmup_tier_total_4_position_internal_only_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
Expand Down Expand Up @@ -283,22 +283,22 @@ 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)
})

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)
})
Expand Down
8 changes: 4 additions & 4 deletions ...ests/more_02_single_position_for_each_warmup_tier_total_4_position_two_external_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
})
Expand Down Expand Up @@ -335,23 +335,23 @@ 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%
})

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%
})

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%
})
Expand Down
10 changes: 5 additions & 5 deletions ...ker/tests/more_04_positions_with_different_liquidity_and_in_range_chane_by_swap_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Expand All @@ -217,31 +217,31 @@ 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%
})

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%
})

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%
})

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%
})
Expand Down
4 changes: 2 additions & 2 deletions contract/r/gnoswap/staker/tests/short_warmup_internal_gnot_gns_3000_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions contract/r/gnoswap/staker/tests/staker_NFT_transfer_01_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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)
})
Expand All @@ -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)))
},
)
})
Expand All @@ -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)))
})
}

Expand Down
8 changes: 4 additions & 4 deletions contract/r/gnoswap/staker/tests/staker_NFT_transfer_03_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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())
})
})
Expand All @@ -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,
Expand Down
14 changes: 7 additions & 7 deletions contract/r/gnoswap/staker/tests/staker_native_create_collect_unstake_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
})
Expand Down Expand Up @@ -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")
})
Expand Down Expand Up @@ -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)
})
}
Expand All @@ -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)
})
}
Expand Down Expand Up @@ -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))
Expand Down
4 changes: 2 additions & 2 deletions contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_10_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
})
Expand Down
2 changes: 1 addition & 1 deletion contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_12_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_15_90d_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_16_180d_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions contract/r/gnoswap/staker/tests/staker_short_warmup_period_external_17_365d_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...ts/staker_short_warmup_period_internal_05_position_in_out_range_changed_by_swap_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...noswap/staker/tests/staker_short_warmup_period_internal_gns_and_external_gns_90_test.gnoA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 6e2d460

Please sign in to comment.