fix: testcases

gnoswap-labs · Feb 19, 2024 · fa30584 · fa30584
1 parent 128dd4f
commit fa30584
Show file tree

Hide file tree

Showing 13 changed files with 321 additions and 230 deletions.
diff --git a/pool/_TEST_INIT_register_tokens_test.gno b/pool/_TEST_INIT_register_tokens_test.gno
@@ -9,10 +9,6 @@ import (
 
 	"gno.land/r/demo/qux"
 
-	"gno.land/r/demo/fred"
-
-	"gno.land/r/demo/thud"
-
 	"gno.land/r/demo/wugnot"
 
 	"gno.land/r/demo/obl"
@@ -82,36 +78,6 @@ func (QuxToken) Approve() func(spender users.AddressOrName, amount uint64) {
 	return qux.Approve
 }
 
-type FredToken struct{}
-
-func (FredToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return fred.Transfer
-}
-func (FredToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return fred.TransferFrom
-}
-func (FredToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return fred.BalanceOf
-}
-func (FredToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return fred.Approve
-}
-
-type ThudToken struct{}
-
-func (ThudToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return thud.Transfer
-}
-func (ThudToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return thud.TransferFrom
-}
-func (ThudToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return thud.BalanceOf
-}
-func (ThudToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return thud.Approve
-}
-
 type WugnotToken struct{}
 
 func (WugnotToken) Transfer() func(to users.AddressOrName, amount uint64) {
@@ -165,8 +131,6 @@ func init() {
 	RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})

diff --git a/position/_TEST_INIT_register_tokens_test.gno b/position/_TEST_INIT_register_tokens_test.gno
@@ -9,10 +9,6 @@ import (
 
 	"gno.land/r/demo/qux"
 
-	"gno.land/r/demo/fred"
-
-	"gno.land/r/demo/thud"
-
 	"gno.land/r/demo/wugnot"
 
 	"gno.land/r/demo/obl"
@@ -84,36 +80,6 @@ func (QuxToken) Approve() func(spender users.AddressOrName, amount uint64) {
 	return qux.Approve
 }
 
-type FredToken struct{}
-
-func (FredToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return fred.Transfer
-}
-func (FredToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return fred.TransferFrom
-}
-func (FredToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return fred.BalanceOf
-}
-func (FredToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return fred.Approve
-}
-
-type ThudToken struct{}
-
-func (ThudToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return thud.Transfer
-}
-func (ThudToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return thud.TransferFrom
-}
-func (ThudToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return thud.BalanceOf
-}
-func (ThudToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return thud.Approve
-}
-
 type WugnotToken struct{}
 
 func (WugnotToken) Transfer() func(to users.AddressOrName, amount uint64) {
@@ -167,8 +133,6 @@ func init() {
 	pl.RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	pl.RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	pl.RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	pl.RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	pl.RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	pl.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	pl.RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	pl.RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})

diff --git a/router/_TEST_INIT_register_tokens_test.gno b/router/_TEST_INIT_register_tokens_test.gno
@@ -9,10 +9,6 @@ import (
 
 	"gno.land/r/demo/qux"
 
-	"gno.land/r/demo/fred"
-
-	"gno.land/r/demo/thud"
-
 	"gno.land/r/demo/wugnot"
 
 	"gno.land/r/demo/obl"
@@ -84,36 +80,6 @@ func (QuxToken) Approve() func(spender users.AddressOrName, amount uint64) {
 	return qux.Approve
 }
 
-type FredToken struct{}
-
-func (FredToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return fred.Transfer
-}
-func (FredToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return fred.TransferFrom
-}
-func (FredToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return fred.BalanceOf
-}
-func (FredToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return fred.Approve
-}
-
-type ThudToken struct{}
-
-func (ThudToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return thud.Transfer
-}
-func (ThudToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return thud.TransferFrom
-}
-func (ThudToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return thud.BalanceOf
-}
-func (ThudToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return thud.Approve
-}
-
 type WugnotToken struct{}
 
 func (WugnotToken) Transfer() func(to users.AddressOrName, amount uint64) {
@@ -168,8 +134,6 @@ func init() {
 	pool.RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	pool.RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	pool.RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})
@@ -179,8 +143,6 @@ func init() {
 	RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})

diff --git a/staker/_TEST_INIT_basic_test.gno b/staker/_TEST_INIT_basic_test.gno
@@ -4,6 +4,8 @@ import (
 	"std"
 	"testing"
 
+	"gno.land/r/demo/consts"
+
 	"gno.land/r/demo/gns"
 
 	"gno.land/r/demo/bar"
@@ -19,8 +21,7 @@ import (
 )
 
 var (
-	test1                         std.Address
-	poolAddr, posAddr, stakerAddr std.Address
+	test1 std.Address
 
 	barPath = "gno.land/r/demo/bar"
 	bazPath = "gno.land/r/demo/baz"
@@ -32,6 +33,8 @@ var (
 	fee100  = uint16(100)
 	fee500  = uint16(500)
 	fee3000 = uint16(3000)
+
+	max_timeout = bigint(9999999999)
 )
 
 func init() {
@@ -40,26 +43,22 @@ func init() {
 	testBanker := std.GetBanker(std.BankerTypeRealmIssue)
 	testBanker.IssueCoin(test1, "ugnot", 500_000_000_000_000)
 
-	poolAddr = std.DerivePkgAddr("gno.land/r/demo/pool")
-	posAddr = std.DerivePkgAddr("gno.land/r/demo/position")
-	stakerAddr = std.DerivePkgAddr("gno.land/r/demo/staker")
-
 	std.TestSetPrevAddr(test1)
 
-	gns.Approve(a2u(poolAddr), 500_000_000_000_000)
+	gns.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
 
-	bar.Approve(a2u(poolAddr), 500_000_000_000_000)
-	baz.Approve(a2u(poolAddr), 500_000_000_000_000)
-	foo.Approve(a2u(poolAddr), 500_000_000_000_000)
-	qux.Approve(a2u(poolAddr), 500_000_000_000_000)
+	bar.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
+	baz.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
+	foo.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
+	qux.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
 
-	obl.Approve(a2u(stakerAddr), 500_000_000_000_000)    // to create external incentive
-	wugnot.Approve(a2u(stakerAddr), 500_000_000_000_000) // to create (native) external incentive
+	obl.Approve(a2u(consts.STAKER_ADDR), 500_000_000_000_000)    // to create external incentive
+	wugnot.Approve(a2u(consts.STAKER_ADDR), 500_000_000_000_000) // to create (native) external incentive
 
-	wugnot.Approve(a2u(poolAddr), 500_000_000_000_000)
+	wugnot.Approve(a2u(consts.POOL_ADDR), 500_000_000_000_000)
 
-	std.TestSetPrevAddr(std.Address("g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm"))
-	gns.Approve(a2u(stakerAddr), 500_000_000_000_000) // to create internal incentive
+	std.TestSetPrevAddr(std.Address("g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm")) // IRA, r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK
+	gns.Approve(a2u(consts.STAKER_ADDR), 500_000_000_000_000)                    // to create internal incentive
 }
 
 /* HELPER */

diff --git a/staker/_TEST_INIT_register_tokens_test.gno b/staker/_TEST_INIT_register_tokens_test.gno
@@ -9,10 +9,6 @@ import (
 
 	"gno.land/r/demo/qux"
 
-	"gno.land/r/demo/fred"
-
-	"gno.land/r/demo/thud"
-
 	"gno.land/r/demo/wugnot"
 
 	"gno.land/r/demo/obl"
@@ -84,36 +80,6 @@ func (QuxToken) Approve() func(spender users.AddressOrName, amount uint64) {
 	return qux.Approve
 }
 
-type FredToken struct{}
-
-func (FredToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return fred.Transfer
-}
-func (FredToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return fred.TransferFrom
-}
-func (FredToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return fred.BalanceOf
-}
-func (FredToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return fred.Approve
-}
-
-type ThudToken struct{}
-
-func (ThudToken) Transfer() func(to users.AddressOrName, amount uint64) {
-	return thud.Transfer
-}
-func (ThudToken) TransferFrom() func(from, to users.AddressOrName, amount uint64) {
-	return thud.TransferFrom
-}
-func (ThudToken) BalanceOf() func(owner users.AddressOrName) uint64 {
-	return thud.BalanceOf
-}
-func (ThudToken) Approve() func(spender users.AddressOrName, amount uint64) {
-	return thud.Approve
-}
-
 type WugnotToken struct{}
 
 func (WugnotToken) Transfer() func(to users.AddressOrName, amount uint64) {
@@ -168,8 +134,6 @@ func init() {
 	pool.RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	pool.RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	pool.RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	pool.RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})
@@ -179,8 +143,6 @@ func init() {
 	RegisterGRC20Interface("gno.land/r/demo/foo", FooToken{})
 	RegisterGRC20Interface("gno.land/r/demo/baz", BazToken{})
 	RegisterGRC20Interface("gno.land/r/demo/qux", QuxToken{})
-	RegisterGRC20Interface("gno.land/r/demo/fred", FredToken{})
-	RegisterGRC20Interface("gno.land/r/demo/thud", ThudToken{})
 	RegisterGRC20Interface("gno.land/r/demo/wugnot", WugnotToken{})
 	RegisterGRC20Interface("gno.land/r/demo/obl", OBLToken{})
 	RegisterGRC20Interface("gno.land/r/demo/gns", GNSToken{})

diff --git a/staker/_TEST_staker_collect_reward_test.gnoa → staker/_TEST_staker_collect_reward_test.gno b/staker/_TEST_staker_collect_reward_test.gnoa → staker/_TEST_staker_collect_reward_test.gno
@@ -4,13 +4,13 @@ import (
 	"std"
 	"testing"
 
-	p "gno.land/r/demo/pool"
-	pos "gno.land/r/demo/position"
+	pl "gno.land/r/demo/pool"
+	pn "gno.land/r/demo/position"
 
-	gnft "gno.land/r/demo/gnft" // GNFT, Gnoswap NFT
-	gns "gno.land/r/demo/gns"   // GNS, Gnoswap Share
+	"gno.land/r/demo/gnft"
+	"gno.land/r/demo/gns"
 
-	obl "gno.land/r/demo/obl" // OBL, External Reward Token
+	"gno.land/r/demo/obl"
 )
 
 func init() {
@@ -31,17 +31,17 @@ func init() {
 func TestPoolInitCreatePool(t *testing.T) {
 	std.TestSetOrigCaller(test1)
 
-	p.InitManual()
+	pl.InitManual()
 	std.TestSkipHeights(1)
 
-	p.CreatePool(barPath, quxPath, 500, 130621891405341611593710811006)
+	pl.CreatePool(barPath, quxPath, 500, 130621891405341611593710811006)
 	std.TestSkipHeights(1)
 }
 
 func TestPositionMint(t *testing.T) {
 	{
 		std.TestSetOrigCaller(test1)
-		tPosTokenId, tPosLiquidity, tPosAmount0, tPosAmount1 := pos.Mint(
+		tPosTokenId, tPosLiquidity, tPosAmount0, tPosAmount1 := pn.Mint(
 			barPath,            // token0
 			quxPath,            // token1
 			uint16(500),        // fee
@@ -66,7 +66,7 @@ func TestPositionMint(t *testing.T) {
 
 	{
 		std.TestSetOrigCaller(test1)
-		tPosTokenId, tPosLiquidity, tPosAmount0, tPosAmount1 := pos.Mint(
+		tPosTokenId, tPosLiquidity, tPosAmount0, tPosAmount1 := pn.Mint(
 			barPath,            // token0
 			quxPath,            // token1
 			uint16(500),        // fee
@@ -158,8 +158,8 @@ func TestUnstakeToken(t *testing.T) {
 		shouldEQ(t, gnft.OwnerOf(tid(2)), test1)
 
 		// check reward
-		shouldEQ(t, gns.BalanceOf(a2u(test1)), 100000000325)    // internal
-		shouldEQ(t, obl.BalanceOf(a2u(test1)), 499980000004243) // external
+		shouldEQ(t, gns.BalanceOf(a2u(test1)), 100000000451)    // internal
+		shouldEQ(t, obl.BalanceOf(a2u(test1)), 499980000004891) // external
 	}
 }