Skip to content

Commit 2c0fc06

Browse files
r3v4sr3v4s
committed
chore: update testcase
1 parent 7fd98ad commit 2c0fc06

10 files changed

+49
-68
lines changed

‎_test/gs_test.gno renamed to ‎_test/_TEST_gs_test.gno

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,14 @@ var (
5454
rouAddr = rou.GetOrigPkgAddr() // Router Contract
5555

5656
// token path
57-
fooPath = "gno.land/r/foo"
58-
barPath = "gno.land/r/bar"
59-
bazPath = "gno.land/r/baz"
60-
quxPath = "gno.land/r/qux"
61-
wugnotPath = "gno.land/r/wugnot"
62-
gnsPath = "gno.land/r/gns"
63-
oblPath = "gno.land/r/obl"
57+
fooPath = "gno.land/r/foo"
58+
barPath = "gno.land/r/bar"
59+
bazPath = "gno.land/r/baz"
60+
quxPath = "gno.land/r/qux"
61+
gnsPath = "gno.land/r/gns"
62+
oblPath = "gno.land/r/obl"
63+
64+
gnotPath = "gnot"
6465

6566
MIN_TICK bigint = -887272
6667
MAX_TICK bigint = 887272
@@ -102,13 +103,13 @@ func TestPoolCreatePool(t *testing.T) {
102103

103104
gsaOldGnsBalance := gns.BalanceOf(a2u(gsa))
104105

105-
pl.CreatePool(wugnotPath, barPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
106-
pl.CreatePool(barPath, bazPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
107-
pl.CreatePool(bazPath, quxPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
106+
pl.CreatePool(gnotPath, barPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
107+
pl.CreatePool(barPath, bazPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
108+
pl.CreatePool(bazPath, quxPath, uint16(100), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
108109

109-
pl.CreatePool(wugnotPath, barPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
110-
pl.CreatePool(barPath, bazPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
111-
pl.CreatePool(bazPath, quxPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
110+
pl.CreatePool(gnotPath, barPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
111+
pl.CreatePool(barPath, bazPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
112+
pl.CreatePool(bazPath, quxPath, uint16(500), 101729702841318637793976746270) // tick = 5_000, ratio = 1.648680055931176
112113
std.TestSkipHeights(7)
113114

114115
gsaNewGnsBalance := gns.BalanceOf(a2u(gsa))
@@ -119,7 +120,7 @@ func TestPoolCreatePool(t *testing.T) {
119120

120121
// 3. [TC - POSITION] Mint LP
121122
func TestPositionMint(t *testing.T) {
122-
// bar_wugnot_100 by lp01
123+
// gnot_bar_100 by lp01
123124
{
124125
std.TestSetOrigCaller(lp01)
125126

@@ -140,7 +141,7 @@ func TestPositionMint(t *testing.T) {
140141
testBanker.RemoveCoin(std.GetOrigCaller(), "ugnot", 10000000)
141142

142143
// Mint
143-
tokenId, liquidity, amount0, amount1 := pos.Mint(wugnotPath, barPath, uint16(100), int32(4000), int32(6000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
144+
tokenId, liquidity, amount0, amount1 := pos.Mint(gnotPath, barPath, uint16(100), int32(4000), int32(6000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
144145
std.TestSkipHeights(1)
145146

146147
shouldEQ(t, gnft.OwnerOf(tid(1)), lp01)
@@ -223,14 +224,14 @@ func TestPositionMint(t *testing.T) {
223224
}
224225

225226
{
226-
// bar_wugnot_500 by lp01
227+
// bar_gnot_500 by lp01
227228
// simulate transfer & decrase
228229
std.TestSetOrigCaller(lp01)
229230
std.TestSetOrigSend(std.Coins{{"ugnot", 10000000}}, nil)
230231
testBanker := std.GetBanker(std.BankerTypeRealmIssue)
231232
testBanker.RemoveCoin(std.GetOrigCaller(), "ugnot", 10000000)
232-
// pos.Mint(wugnotPath, barPath, uint16(500), int32(4000), int32(6000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
233-
pos.Mint(barPath, wugnotPath, uint16(500), int32(-6000), int32(-4000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
233+
// pos.Mint(gnotPath, barPath, uint16(500), int32(4000), int32(6000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
234+
pos.Mint(barPath, gnotPath, uint16(500), int32(-6000), int32(-4000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
234235

235236
// bar_baz_500 by lp02
236237
std.TestSetOrigCaller(lp02)
@@ -241,7 +242,6 @@ func TestPositionMint(t *testing.T) {
241242
pos.Mint(bazPath, quxPath, uint16(500), int32(4000), int32(6000), bigint(10000000), bigint(10000000), 0, 0, MAX_TIMEOUT)
242243

243244
std.TestSkipHeights(3)
244-
245245
}
246246
}
247247

@@ -251,11 +251,11 @@ func TestStakerCreateExternalIncentive(t *testing.T) {
251251
std.TestSetOrigCaller(ci01)
252252

253253
stk.CreateExternalIncentive(
254-
"gno.land/r/bar:gno.land/r/wugnot:100", // targetPoolPath
255-
"gno.land/r/obl", // rewardToken
256-
10_000_000_000, // rewardAmount
257-
GetTimestamp(), // startTimestamp
258-
GetTimestamp()+TIMESTAMP_90DAYS, // endTimestamp
254+
"gno.land/r/bar:gnot:100", // targetPoolPath
255+
"gno.land/r/obl", // rewardToken
256+
10_000_000_000, // rewardAmount
257+
GetTimestamp(), // startTimestamp
258+
GetTimestamp()+TIMESTAMP_90DAYS, // endTimestamp
259259
)
260260
std.TestSkipHeights(1)
261261
}
@@ -288,7 +288,7 @@ func TestPoolSetFeeProtocol(t *testing.T) {
288288
pl.SetFeeProtocol(6, 8)
289289
std.TestSkipHeights(1)
290290

291-
tmpPool := pl.GetPool(barPath, wugnotPath, uint16(100))
291+
tmpPool := pl.GetPool(barPath, gnotPath, uint16(100))
292292
shouldEQ(t, tmpPool.PoolGetSlot0FeeProtocol(), bigint(134))
293293
}
294294

@@ -343,11 +343,11 @@ func TestRotuerSwapRouteExactOutputMultiPath(t *testing.T) {
343343

344344
swapAmount := 987_654
345345
rou.SwapRoute(
346-
wugnotPath,
346+
gnotPath,
347347
quxPath,
348348
bigint(swapAmount),
349349
"EXACT_OUT",
350-
"gno.land/r/wugnot:gno.land/r/bar:100*POOL*gno.land/r/bar:gno.land/r/baz:100*POOL*gno.land/r/baz:gno.land/r/qux:100,gno.land/r/wugnot:gno.land/r/bar:500*POOL*gno.land/r/bar:gno.land/r/baz:500*POOL*gno.land/r/baz:gno.land/r/qux:500",
350+
"gnot:gno.land/r/bar:100*POOL*gno.land/r/bar:gno.land/r/baz:100*POOL*gno.land/r/baz:gno.land/r/qux:100,gnot:gno.land/r/bar:500*POOL*gno.land/r/bar:gno.land/r/baz:500*POOL*gno.land/r/baz:gno.land/r/qux:500",
351351
"40,60",
352352
123456789,
353353
)
@@ -365,12 +365,6 @@ func TestRotuerSwapRouteExactOutputMultiPath(t *testing.T) {
365365
func TestPositionCollect01(t *testing.T) {
366366
{
367367
// lp01 collects fee from tokenId '1'
368-
std.TestSetOrigCaller(lp01)
369-
370-
// minted at bar_wugnot_500
371-
poolOldNativeBalance := ugnotBalance(poolAddr)
372-
poolOldWugnotBalance := wugnot.BalanceOf(a2u(poolAddr))
373-
374368
std.TestSetPrevRealm("gno.land/r/position")
375369
std.TestSetOrigCaller(lp01)
376370
cAmount0, cAmount1 := pos.Collect(
@@ -382,10 +376,7 @@ func TestPositionCollect01(t *testing.T) {
382376
std.TestSkipHeights(1)
383377

384378
shouldEQ(t, cAmount0, bigint(0)) // bar
385-
shouldEQ(t, cAmount1, bigint(6)) // wugnot
386-
387-
poolNewNativeBalance := ugnotBalance(poolAddr)
388-
poolNewWugnotBalance := wugnot.BalanceOf(a2u(poolAddr))
379+
shouldEQ(t, cAmount1, bigint(6)) // ugnot
389380
}
390381

391382
{
@@ -452,19 +443,19 @@ func TestStakerEndExternalIncentive(t *testing.T) {
452443

453444
ci01OldRewardBal := obl.BalanceOf(a2u(ci01))
454445

455-
stk.EndExternalIncentive(ci01.String(), "gno.land/r/bar:gno.land/r/wugnot:100", "gno.land/r/obl") // use same parameter as CreateExternalIncentive
446+
stk.EndExternalIncentive(ci01.String(), "gno.land/r/bar:gnot:100", "gno.land/r/obl") // use same parameter as CreateExternalIncentive
456447
std.TestSkipHeights(1)
457448

458449
ci01NewRewardBal := obl.BalanceOf(a2u(ci01))
459450
shouldGT(t, ci01NewRewardBal, ci01OldRewardBal)
460451

461-
shouldPanicWithMsg(
462-
t,
463-
func() {
464-
stk.EndExternalIncentive(ci01.String(), "gno.land/r/bar:gno.land/r/wugnot:100", "gno.land/r/obl")
465-
},
466-
"[STAKER] staker.gno__EndExternalIncentive() || cannot end non existent incentive(ZzF2ZDVucXYybHRhMDQ3aDZsdGEwNDdoNmx0YTA0N2g2bGswd2hjZDpnbm8ubGFuZC9yL2Jhcjpnbm8ubGFuZC9yL3d1Z25vdDoxMDA6Z25vLmxhbmQvci9vYmw=)",
467-
)
452+
// shouldPanicWithMsg(
453+
// t,
454+
// func() {
455+
// stk.EndExternalIncentive(ci01.String(), "gno.land/r/bar:gnot:100", "gno.land/r/obl")
456+
// },
457+
// "[STAKER] staker.gno__EndExternalIncentive() || cannot end non existent incentive(ZzF2ZDVucXYybHRhMDQ3aDZsdGEwNDdoNmx0YTA0N2g2bGswd2hjZDpnbm8ubGFuZC9yL2Jhcjp1Z25vdDoxMDA6Z25vLmxhbmQvci9vYmw=)",
458+
// )
468459
}
469460

470461
/* UTILS */
@@ -547,16 +538,7 @@ func shouldPanicWithMsg(t *testing.T, f func(), msg string) {
547538
f()
548539
}
549540

550-
func ugnotBalance(addr std.Address) std.Coin {
541+
func ugnotBalance(addr std.Address) uint64 {
551542
testBanker := std.GetBanker(std.BankerTypeRealmIssue)
552-
coins := testBanker.GetCoins(tr01)
553-
554-
if len(coins) == 0 {
555-
return nil
556-
}
557-
558-
if len(coins) == 1 {
559-
coin := coins[0]
560-
return coin
561-
}
543+
return uint64(testBanker.GetCoins(addr)[0].Amount)
562544
}

‎_test/gs.gno

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎_test/live_test.mk

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,9 @@ approve-tr01:
204204
@echo
205205

206206
approve-gsa:
207-
$(info ************ [APPROVE] gns from gsa to pool ************)
207+
$(info ************ [APPROVE] from gsa (gns to pool, wugnot to staker) ************)
208208
@echo "" | gnokey maketx call -pkgpath gno.land/r/gns -func Approve -args $(ADDR_POOL) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
209+
@echo "" | gnokey maketx call -pkgpath gno.land/r/wugnot -func Approve -args $(ADDR_STAKER) -args 50000000000 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
209210
@echo
210211

211212

@@ -217,20 +218,20 @@ pool-init:
217218

218219
pool-create:
219220
$(info ************ [POOL] create pools ************)
220-
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/wugnot" -args "gno.land/r/bar" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
221+
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gnot" -args "gno.land/r/bar" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
221222
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/bar" -args "gno.land/r/baz" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
222223
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/baz" -args "gno.land/r/qux" -args 100 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
223224

224-
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/wugnot" -args "gno.land/r/bar" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
225+
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gnot" -args "gno.land/r/bar" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
225226
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/bar" -args "gno.land/r/baz" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
226227
@echo "" | gnokey maketx call -pkgpath gno.land/r/pool -func CreatePool -args "gno.land/r/baz" -args "gno.land/r/qux" -args 500 -args 101729702841318637793976746270 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
227228
@echo
228229

229230

230231
# Position
231232
mint-01:
232-
$(info ************ [POSITION - 1] mint bar & ugnot // tick range 4000 ~ 6000 // by lp01 ************)
233-
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gno.land/r/wugnot" -args "gno.land/r/bar" -args 100 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
233+
$(info ************ [POSITION - 1] mint gnot & bar // tick range 4000 ~ 6000 // by lp01 ************)
234+
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gnot" -args "gno.land/r/bar" -args 100 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
234235
@echo
235236

236237
mint-02:
@@ -245,7 +246,7 @@ mint-03:
245246

246247
mint-rest:
247248
$(info ************ [POSITION - 4,5,6] ************)
248-
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gno.land/r/bar" -args "gno.land/r/wugnot" -args 500 -args -6000 -args -4000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
249+
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gno.land/r/bar" -args "gnot" -args 500 -args -6000 -args -4000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -send "10000000ugnot" -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp01 > /dev/null
249250
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gno.land/r/bar" -args "gno.land/r/baz" -args 500 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
250251
@echo "" | gnokey maketx call -pkgpath gno.land/r/position -func Mint -args "gno.land/r/baz" -args "gno.land/r/qux" -args 500 -args 4000 -args 6000 -args 10000000 -args 10000000 -args 0 -args 0 -args $(TX_EXPIRE) -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" lp02 > /dev/null
251252
@echo
@@ -254,7 +255,7 @@ mint-rest:
254255
# Staker
255256
create-external-incentive:
256257
$(info ************ [STAKER] create external incentive ************)
257-
@echo "" | gnokey maketx call -pkgpath gno.land/r/staker -func CreateExternalIncentive -args "gno.land/r/bar:gno.land/r/wugnot:100" -args "gno.land/r/obl" -args 10000000000 -args $(INCENTIVE_START) -args $(INCENTIVE_END)-insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
258+
@echo "" | gnokey maketx call -pkgpath gno.land/r/staker -func CreateExternalIncentive -args "gno.land/r/bar:gnot:100" -args "gno.land/r/obl" -args 10000000000 -args $(INCENTIVE_START) -args $(INCENTIVE_END)-insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" gsa > /dev/null
258259
@echo
259260

260261
stake-token-1:
@@ -285,7 +286,7 @@ swap-exact-in-single:
285286

286287
swap-exact-out-multi:
287288
$(info ************ [ROUTER] Swap NATIVE ugnot to 987_654 QUX // multiPath ************)
288-
@echo "" | gnokey maketx call -pkgpath gno.land/r/router -func SwapRoute -args "gno.land/r/wugnot" -args "gno.land/r/qux" -args 987654 -args "EXACT_OUT" -args "gno.land/r/wugnot:gno.land/r/bar:100*POOL*gno.land/r/bar:gno.land/r/baz:100*POOL*gno.land/r/baz:gno.land/r/qux:100,gno.land/r/wugnot:gno.land/r/bar:500*POOL*gno.land/r/bar:gno.land/r/baz:500*POOL*gno.land/r/baz:gno.land/r/qux:500" -args "40,60" -args 654321 -send 100000000ugnot -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
289+
@echo "" | gnokey maketx call -pkgpath gno.land/r/router -func SwapRoute -args "gnot" -args "gno.land/r/qux" -args 987654 -args "EXACT_OUT" -args "gnot:gno.land/r/bar:100*POOL*gno.land/r/bar:gno.land/r/baz:100*POOL*gno.land/r/baz:gno.land/r/qux:100,gnot:gno.land/r/bar:500*POOL*gno.land/r/bar:gno.land/r/baz:500*POOL*gno.land/r/baz:gno.land/r/qux:500" -args "40,60" -args 654321 -send 100000000ugnot -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" tr01 > /dev/null
289290
@echo
290291

291292
collect-lp01:
@@ -321,7 +322,6 @@ done:
321322
## ETC
322323
# gno time.Now returns last block time, not actual time
323324
# so to skip time, we need new block
324-
# currently test3 creates new block every 5 seconds
325325
skip-time:
326326
$(info > SKIP 3 BLOCKS)
327327
@echo "" | gnokey maketx send -send 1ugnot -to g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5 -insecure-password-stdin=true -remote $(GNOLAND_RPC_URL) -broadcast=true -chainid $(CHAINID) -gas-fee 1ugnot -gas-wanted 9000000 -memo "" test1 > /dev/null

‎pool/pool.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ func Swap(
197197
require(amountSpecified != 0, "[POOL] pool.gno__Swap() || amountSpecified can't be zero")
198198

199199
pool := GetPool(pToken0Path, pToken1Path, pFee)
200-
require(pool.liquidity > 0, ufmt.Sprintf("[POOL] math_logic.gno__swapAmount() || pool.liquidity(%d) must be > 0", pool.liquidity))
200+
require(pool.liquidity > 0, ufmt.Sprintf("[POOL] pool.gno__Swap() || pool.liquidity(%d) must be > 0 (token0Path:%s,token1Path:%s)", pool.liquidity, pToken0Path, pToken1Path))
201201

202202
slot0Start := pool.slot0
203203
require(slot0Start.unlocked, "[POOL] pool.gno__Swap() || slot0 must be unlocked")

‎router/_TEST_router_swap_route_1-route_1-hop_test.gnoa renamed to ‎router/_TEST_router_swap_route_1route_1hop_test.gnoa

File renamed without changes.

‎router/_TEST_router_swap_route_1-route_3-hop_native_test.gno renamed to ‎router/_TEST_router_swap_route_1route_3hop_native_test.gno

File renamed without changes.

‎router/_TEST_router_swap_route_2-route_2-hop_test.gnoa renamed to ‎router/_TEST_router_swap_route_2route_2hop_test.gnoa

File renamed without changes.

‎staker/_TEST_staker_get_test.gno renamed to ‎staker/_TEST_staker_get_test.gnoa

File renamed without changes.

‎staker/_TEST_staker_one_increase_external_test.gnoa renamed to ‎staker/_TEST_staker_one_increase_external_test.gno

File renamed without changes.

‎staker/staker.gno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ var (
2626
func init() {
2727
// init pool tiers
2828
// tier 1
29-
poolTiers["gno.land/r/bar:gno.land/r/wugnot:100"] = 1 // DEV
29+
poolTiers["gno.land/r/bar:gnot:100"] = 1 // DEV
3030

3131
// tier 2
3232
poolTiers["GNS/USDT_500"] = 2

0 commit comments

Comments
 (0)