test: change external incentive start time

- due to this, result of reward amount has been changed
gnoswap-labs · Apr 9, 2024 · 0805dd3 · 0805dd3
1 parent 93956b8
commit 0805dd3
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 48 deletions.
diff --git a/staker/_TEST_/_TEST_staker_collect_reward_test.gn b/staker/_TEST_/_TEST_staker_collect_reward_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	"gno.land/r/gnoswap/consts"
 
@@ -118,15 +117,15 @@ func TestCreateExternalIncentive(t *testing.T) {
 		"gno.land/r/demo/bar:gno.land/r/demo/qux:500", // targetPoolPath
 		"gno.land/r/demo/obl",                         // rewardToken
 		"1000000000",                                  // rewardAmount 10_000_000_000
-		time.Now().Unix(),                             // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS,            // endTimestamp
+		1234569600,                                    // startTimestamp
+		1234569600+TIMESTAMP_90DAYS,                   // endTimestamp
 	)
 	std.TestSkipHeights(1)
 
 	obl.Approve(a2u(consts.STAKER_ADDR), uint64(10_000_000_000))
 	std.TestSkipHeights(1)
 
-	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/qux:500", "gno.land/r/demo/obl", "1000000000", time.Now().Unix(), time.Now().Unix()+TIMESTAMP_90DAYS)
+	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/qux:500", "gno.land/r/demo/obl", "1000000000", 1234569600, 1234569600+TIMESTAMP_90DAYS)
 	std.TestSkipHeights(1)
 }
 
@@ -170,14 +169,16 @@ func TestCollectReward(t *testing.T) {
 
 func TestUnstakeToken01(t *testing.T) {
 	std.TestSetPrevAddr(test1)
+	std.TestSkipHeights(400) // spend more time
+
 	UnstakeToken(1) // GNFT tokenId
 	std.TestSkipHeights(1)
 
 	shouldEQ(t, gnft.OwnerOf(tid(1)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 36754)      // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8000000378) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 2487004)    // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8000004851) // external
 }
 
 func TestUnstakeToken02(t *testing.T) {
@@ -188,8 +189,8 @@ func TestUnstakeToken02(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(2)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 281779)     // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8000002898) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 19067029)   // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8000037608) // external
 }
 
 func TestEndExternalIncentive(t *testing.T) {

diff --git a/staker/_TEST_/_TEST_staker_get_test.gn b/staker/_TEST_/_TEST_staker_get_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	"gno.land/r/gnoswap/consts"
 
@@ -104,15 +103,15 @@ func TestCreateExternalIncentive(t *testing.T) {
 		"gno.land/r/demo/bar:gno.land/r/demo/qux:500", // targetPoolPath
 		"gno.land/r/demo/obl",                         // rewardToken
 		"1000000000",                                  // rewardAmount
-		time.Now().Unix(),                             // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS,            // endTimestamp
+		1234569600,                                    // startTimestamp
+		1234569600+TIMESTAMP_90DAYS,                   // endTimestamp
 	)
 	std.TestSkipHeights(1)
 
 	obl.Approve(a2u(consts.STAKER_ADDR), uint64(10_000_000_000))
 	std.TestSkipHeights(1)
 
-	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/qux:500", "gno.land/r/demo/obl", "1000000000", time.Now().Unix(), time.Now().Unix()+TIMESTAMP_90DAYS)
+	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/qux:500", "gno.land/r/demo/obl", "1000000000", 1234569600, 1234569600+TIMESTAMP_90DAYS)
 	std.TestSkipHeights(1)
 }
 

diff --git a/staker/_TEST_/_TEST_staker_internal_external_test.gn b/staker/_TEST_/_TEST_staker_internal_external_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	"gno.land/r/gnoswap/consts"
 
@@ -139,8 +138,8 @@ func TestCreateExternalIncentive(t *testing.T) {
 		"gno.land/r/demo/foo:gno.land/r/demo/qux:500", // targetPoolPath
 		"gno.land/r/demo/obl",                         // rewardToken
 		"100000000",                                   // rewardAmount
-		time.Now().Unix(),                             // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS,            // endTimestamp
+		1234569600,                                    // startTimestamp
+		1234569600+TIMESTAMP_90DAYS,                   // endTimestamp
 	)
 	std.TestSkipHeights(1)
 }
@@ -234,7 +233,7 @@ func TestCollectExternalReward(t *testing.T) {
 	std.TestSkipHeights(1)
 
 	oblNew := obl.BalanceOf(a2u(test1))
-	shouldEQ(t, oblNew, 9900020915)
+	shouldEQ(t, oblNew, 9900014200)
 }
 
 func TestCollectAll(t *testing.T) {
@@ -252,7 +251,7 @@ func TestUnstakeToken1(t *testing.T) {
 	gnsOld := gns.BalanceOf(a2u(test1))
 	oblOld := obl.BalanceOf(a2u(test1))
 	shouldEQ(t, gnsOld, 66009736)
-	shouldEQ(t, oblOld, 9900020936)
+	shouldEQ(t, oblOld, 9900014221)
 
 	std.TestSkipHeights(100000)
 	UnstakeToken(1)
@@ -265,7 +264,7 @@ func TestUnstakeToken1(t *testing.T) {
 
 	UnstakeToken(3)
 	oblNew := obl.BalanceOf(a2u(test1))
-	shouldEQ(t, oblNew, 9903499997)
+	shouldEQ(t, oblNew, 9903488806)
 
 	std.TestSkipHeights(1)
 }
diff --git a/staker/_TEST_/_TEST_staker_one_external_native_test.gn b/staker/_TEST_/_TEST_staker_one_external_native_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	pl "gno.land/r/demo/pool"
 	pn "gno.land/r/demo/position"
@@ -129,8 +128,8 @@ func TestCreateExternalIncentive(t *testing.T) {
 		"gno.land/r/demo/bar:gno.land/r/demo/foo:500", // targetPoolPath
 		consts.WRAPPED_WUGNOT,                         // rewardToken
 		"10000000000",                                 // rewardAmount
-		time.Now().Unix(),                             // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS,            // endTimestamp
+		1234569600,                                    // startTimestamp
+		1234569600+TIMESTAMP_90DAYS,                   // endTimestamp
 	)
 	std.TestSkipHeights(1)
 }
@@ -156,7 +155,7 @@ func TestStakeToken02(t *testing.T) {
 func TestUnstakeToken01(t *testing.T) {
 	std.TestSetPrevAddr(consts.INTERNAL_REWARD_ACCOUNT)
 	gns.Approve(a2u(consts.STAKER_ADDR), consts.UINT64_MAX) // internal reward distribution
-	std.TestSkipHeights(1)
+	std.TestSkipHeights(335)                                // skip times
 
 	std.TestSetPrevAddr(test1)
 	UnstakeToken(1) // GNFT tokenId
@@ -165,8 +164,8 @@ func TestUnstakeToken01(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(1)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 18377)  // internal
-	shouldEQ(t, wugnot.BalanceOf(a2u(test1)), 945) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 2064336) // internal
+	shouldEQ(t, wugnot.BalanceOf(a2u(test1)), 2521) // external
 }
 
 func TestUnstakeToken02(t *testing.T) {
@@ -177,8 +176,8 @@ func TestUnstakeToken02(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(2)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 140890)  // internal
-	shouldEQ(t, wugnot.BalanceOf(a2u(test1)), 7247) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 15826574) // internal
+	shouldEQ(t, wugnot.BalanceOf(a2u(test1)), 21428) // external
 }
 
 func TestEndExternalIncentive(t *testing.T) {

diff --git a/staker/_TEST_/_TEST_staker_one_external_test.gn b/staker/_TEST_/_TEST_staker_one_external_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	// @notJoon JSON
 
@@ -118,10 +117,10 @@ func TestCreateExternalIncentive(t *testing.T) {
 
 	CreateExternalIncentive(
 		"gno.land/r/demo/bar:gno.land/r/demo/foo:500", // targetPoolPath
-		oblPath,                            // rewardToken
-		"10000000000",                      // rewardAmount
-		time.Now().Unix(),                  // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS, // endTimestamp
+		oblPath,                     // rewardToken
+		"10000000000",               // rewardAmount
+		1234569600,                  // startTimestamp
+		1234569600+TIMESTAMP_90DAYS, // endTimestamp
 	)
 	std.TestSkipHeights(1)
 }
@@ -159,7 +158,7 @@ func TestStakeToken02(t *testing.T) {
 func TestUnstakeToken01(t *testing.T) {
 	std.TestSetPrevAddr(consts.INTERNAL_REWARD_ACCOUNT)
 	gns.Approve(a2u(consts.STAKER_ADDR), consts.UINT64_MAX) // internal reward distribution
-	std.TestSkipHeights(1)
+	std.TestSkipHeights(330)
 
 	std.TestSetPrevAddr(test1)
 	UnstakeToken(1) // GNFT tokenId
@@ -168,8 +167,8 @@ func TestUnstakeToken01(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(1)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 18377) // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 945)   // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 2033707) // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 630)     // external
 }
 
 func TestUnstakeToken02(t *testing.T) {
@@ -180,8 +179,8 @@ func TestUnstakeToken02(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(2)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 140890) // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 7247)   // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 15591757) // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 6932)     // external
 }
 
 func TestEndExternalIncentive(t *testing.T) {

diff --git a/staker/_TEST_/_TEST_staker_one_increase_external_test.gn b/staker/_TEST_/_TEST_staker_one_increase_external_test.gn
@@ -3,7 +3,6 @@ package staker
 import (
 	"std"
 	"testing"
-	"time"
 
 	"gno.land/p/demo/json"
 
@@ -117,16 +116,16 @@ func TestCreateExternalIncentive(t *testing.T) {
 
 	CreateExternalIncentive(
 		"gno.land/r/demo/bar:gno.land/r/demo/foo:500", // targetPoolPath
-		oblPath,                            // rewardToken
-		"1000000000",                       // rewardAmount
-		time.Now().Unix(),                  // startTimestamp
-		time.Now().Unix()+TIMESTAMP_90DAYS, // endTimestamp
+		oblPath,                     // rewardToken
+		"1000000000",                // rewardAmount
+		1234569600,                  // startTimestamp
+		1234569600+TIMESTAMP_90DAYS, // endTimestamp
 	)
 	std.TestSkipHeights(1)
 
 	obl.Approve(a2u(consts.STAKER_ADDR), 10_000_000_000)
 	std.TestSkipHeights(1)
-	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/foo:500", oblPath, "100000000", time.Now().Unix(), time.Now().Unix()+TIMESTAMP_90DAYS)
+	CreateExternalIncentive("gno.land/r/demo/bar:gno.land/r/demo/foo:500", oblPath, "100000000", 1234569600, 1234569600+TIMESTAMP_90DAYS)
 	std.TestSkipHeights(1)
 }
 
@@ -183,7 +182,7 @@ func TestApiGetRewardTokens(t *testing.T) {
 func TestUnstakeToken01(t *testing.T) {
 	std.TestSetPrevAddr(consts.INTERNAL_REWARD_ACCOUNT)
 	gns.Approve(a2u(consts.STAKER_ADDR), consts.UINT64_MAX) // internal reward distribution
-	std.TestSkipHeights(1)
+	std.TestSkipHeights(350)
 
 	std.TestSetPrevAddr(test1)
 	UnstakeToken(1) // GNFT tokenId
@@ -192,8 +191,8 @@ func TestUnstakeToken01(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(1)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 18377)      // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8900000103) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 2156220)    // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8900000831) // external
 }
 
 func TestUnstakeToken02(t *testing.T) {
@@ -204,8 +203,8 @@ func TestUnstakeToken02(t *testing.T) {
 	shouldEQ(t, gnft.OwnerOf(tid(2)), test1)
 
 	// check reward
-	shouldEQ(t, gns.BalanceOf(a2u(test1)), 140890)     // internal
-	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8900000796) // external
+	shouldEQ(t, gns.BalanceOf(a2u(test1)), 16531020)   // internal
+	shouldEQ(t, obl.BalanceOf(a2u(test1)), 8900006600) // external
 }
 
 func TestEndExternalIncentive(t *testing.T) {
@@ -216,7 +215,7 @@ func TestEndExternalIncentive(t *testing.T) {
 	// incentive time isn't over yet
 	shouldPanicWithMsg(t, func() {
 		EndExternalIncentive(test1.String(), "gno.land/r/demo/bar:gno.land/r/demo/foo:500", "gno.land/r/demo/obl")
-	}, "[STAKER] staker.gno__EndExternalIncentive() || cannot end incentive before endTimestamp(1242343945), current(1234567985)")
+	}, "[STAKER] staker.gno__EndExternalIncentive() || cannot end incentive before endTimestamp(1242345600), current(1234569730)")
 
 	std.TestSkipHeights(9999999)
 	EndExternalIncentive(test1.String(), "gno.land/r/demo/bar:gno.land/r/demo/foo:500", "gno.land/r/demo/obl") // use same parameter as CreateExternalIncentive()