Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 16d4e06

Browse files
moulmoul
committedOct 17, 2024·
chore: fixup
Signed-off-by: moul <[email protected]>
1 parent bfa8c4b commit 16d4e06

File tree

2 files changed

+42
-47
lines changed

2 files changed

+42
-47
lines changed
 

‎examples/gno.land/p/demo/grc/grc20/tellers_test.gno

+40-45
Original file line numberDiff line numberDiff line change
@@ -10,126 +10,121 @@ import (
1010
"gno.land/p/demo/urequire"
1111
)
1212

13-
func TestBankImpl(t *testing.T) {
14-
bank, _ := NewToken("Dummy", "DUMMY", 4)
15-
urequire.False(t, bank == nil, "dummy should not be nil")
13+
func TestPrevRealmTellerImpl(t *testing.T) {
14+
token, _ := NewToken("Dummy", "DUMMY", 4)
15+
teller := PrevRealmTeller(token)
16+
urequire.False(t, token == nil)
17+
var _ GRC20 = teller
1618
}
1719

18-
func TestPrevRealmBankerImpl(t *testing.T) {
19-
bank, _ := NewToken("Dummy", "DUMMY", 4)
20-
banker := PrevRealmBanker(bank)
21-
urequire.False(t, banker == nil)
22-
var _ GRC20 = banker
23-
}
24-
25-
func TestBank(t *testing.T) {
20+
func TestTeller(t *testing.T) {
2621
var (
2722
alice = testutils.TestAddress("alice")
2823
bob = testutils.TestAddress("bob")
2924
carl = testutils.TestAddress("carl")
3025
)
3126

32-
bank, adm := NewToken("Dummy", "DUMMY", 6)
27+
token, ledger := NewToken("Dummy", "DUMMY", 6)
3328

3429
checkBalances := func(aliceEB, bobEB, carlEB uint64) {
3530
t.Helper()
3631
exp := ufmt.Sprintf("alice=%d bob=%d carl=%d", aliceEB, bobEB, carlEB)
37-
aliceGB := bank.BalanceOf(alice)
38-
bobGB := bank.BalanceOf(bob)
39-
carlGB := bank.BalanceOf(carl)
32+
aliceGB := token.BalanceOf(alice)
33+
bobGB := token.BalanceOf(bob)
34+
carlGB := token.BalanceOf(carl)
4035
got := ufmt.Sprintf("alice=%d bob=%d carl=%d", aliceGB, bobGB, carlGB)
4136
uassert.Equal(t, got, exp, "invalid balances")
4237
}
4338
checkAllowances := func(abEB, acEB, baEB, bcEB, caEB, cbEB uint64) {
4439
t.Helper()
4540
exp := ufmt.Sprintf("ab=%d ac=%d ba=%d bc=%d ca=%d cb=%s", abEB, acEB, baEB, bcEB, caEB, cbEB)
46-
abGB := bank.Allowance(alice, bob)
47-
acGB := bank.Allowance(alice, carl)
48-
baGB := bank.Allowance(bob, alice)
49-
bcGB := bank.Allowance(bob, carl)
50-
caGB := bank.Allowance(carl, alice)
51-
cbGB := bank.Allowance(carl, bob)
41+
abGB := token.Allowance(alice, bob)
42+
acGB := token.Allowance(alice, carl)
43+
baGB := token.Allowance(bob, alice)
44+
bcGB := token.Allowance(bob, carl)
45+
caGB := token.Allowance(carl, alice)
46+
cbGB := token.Allowance(carl, bob)
5247
got := ufmt.Sprintf("ab=%d ac=%d ba=%d bc=%d ca=%d cb=%s", abGB, acGB, baGB, bcGB, caGB, cbGB)
5348
uassert.Equal(t, got, exp, "invalid allowances")
5449
}
5550

5651
checkBalances(0, 0, 0)
5752
checkAllowances(0, 0, 0, 0, 0, 0)
5853

59-
urequire.NoError(t, adm.Mint(alice, 1000))
60-
urequire.NoError(t, adm.Mint(alice, 100))
54+
urequire.NoError(t, ledger.Mint(alice, 1000))
55+
urequire.NoError(t, ledger.Mint(alice, 100))
6156
checkBalances(1100, 0, 0)
6257
checkAllowances(0, 0, 0, 0, 0, 0)
6358

64-
urequire.NoError(t, adm.Approve(alice, bob, 99999999))
59+
urequire.NoError(t, ledger.Approve(alice, bob, 99999999))
6560
checkBalances(1100, 0, 0)
6661
checkAllowances(99999999, 0, 0, 0, 0, 0)
6762

68-
urequire.NoError(t, adm.Approve(alice, bob, 400))
63+
urequire.NoError(t, ledger.Approve(alice, bob, 400))
6964
checkBalances(1100, 0, 0)
7065
checkAllowances(400, 0, 0, 0, 0, 0)
7166

72-
urequire.Error(t, adm.TransferFrom(alice, bob, carl, 100000000))
67+
urequire.Error(t, ledger.TransferFrom(alice, bob, carl, 100000000))
7368
checkBalances(1100, 0, 0)
7469
checkAllowances(400, 0, 0, 0, 0, 0)
7570

76-
urequire.NoError(t, adm.TransferFrom(alice, bob, carl, 100))
71+
urequire.NoError(t, ledger.TransferFrom(alice, bob, carl, 100))
7772
checkBalances(1000, 0, 100)
7873
checkAllowances(300, 0, 0, 0, 0, 0)
7974

80-
urequire.Error(t, adm.SpendAllowance(alice, bob, 2000000))
75+
urequire.Error(t, ledger.SpendAllowance(alice, bob, 2000000))
8176
checkBalances(1000, 0, 100)
8277
checkAllowances(300, 0, 0, 0, 0, 0)
8378

84-
urequire.NoError(t, adm.SpendAllowance(alice, bob, 100))
79+
urequire.NoError(t, ledger.SpendAllowance(alice, bob, 100))
8580
checkBalances(1000, 0, 100)
8681
checkAllowances(200, 0, 0, 0, 0, 0)
8782
}
8883

89-
func TestPrevRealmBanker(t *testing.T) {
84+
func TestPrevRealmTeller(t *testing.T) {
9085
alice := testutils.TestAddress("alice")
9186
bob := testutils.TestAddress("bob")
9287
carl := testutils.TestAddress("carl")
9388

94-
bank, adm := NewToken("Dummy", "DUMMY", 6)
95-
banker := PrevRealmBanker(bank)
89+
token, ledger := NewToken("Dummy", "DUMMY", 6)
90+
teller := PrevRealmTeller(token)
9691

9792
checkBalances := func(aliceEB, bobEB, carlEB uint64) {
9893
t.Helper()
9994
exp := ufmt.Sprintf("alice=%d bob=%d carl=%d", aliceEB, bobEB, carlEB)
100-
aliceGB := bank.BalanceOf(alice)
101-
bobGB := bank.BalanceOf(bob)
102-
carlGB := bank.BalanceOf(carl)
95+
aliceGB := token.BalanceOf(alice)
96+
bobGB := token.BalanceOf(bob)
97+
carlGB := token.BalanceOf(carl)
10398
got := ufmt.Sprintf("alice=%d bob=%d carl=%d", aliceGB, bobGB, carlGB)
10499
uassert.Equal(t, got, exp, "invalid balances")
105100
}
106101
checkAllowances := func(abEB, acEB, baEB, bcEB, caEB, cbEB uint64) {
107102
t.Helper()
108103
exp := ufmt.Sprintf("ab=%d ac=%d ba=%d bc=%d ca=%d cb=%s", abEB, acEB, baEB, bcEB, caEB, cbEB)
109-
abGB := bank.Allowance(alice, bob)
110-
acGB := bank.Allowance(alice, carl)
111-
baGB := bank.Allowance(bob, alice)
112-
bcGB := bank.Allowance(bob, carl)
113-
caGB := bank.Allowance(carl, alice)
114-
cbGB := bank.Allowance(carl, bob)
104+
abGB := token.Allowance(alice, bob)
105+
acGB := token.Allowance(alice, carl)
106+
baGB := token.Allowance(bob, alice)
107+
bcGB := token.Allowance(bob, carl)
108+
caGB := token.Allowance(carl, alice)
109+
cbGB := token.Allowance(carl, bob)
115110
got := ufmt.Sprintf("ab=%d ac=%d ba=%d bc=%d ca=%d cb=%s", abGB, acGB, baGB, bcGB, caGB, cbGB)
116111
uassert.Equal(t, got, exp, "invalid allowances")
117112
}
118113

119-
urequire.NoError(t, adm.Mint(alice, 1000))
114+
urequire.NoError(t, ledger.Mint(alice, 1000))
120115
checkBalances(1000, 0, 0)
121116
checkAllowances(0, 0, 0, 0, 0, 0)
122117

123118
std.TestSetOrigCaller(alice)
124-
urequire.NoError(t, banker.Approve(bob, 600))
119+
urequire.NoError(t, teller.Approve(bob, 600))
125120
checkBalances(1000, 0, 0)
126121
checkAllowances(600, 0, 0, 0, 0, 0)
127122

128123
std.TestSetOrigCaller(bob)
129-
urequire.Error(t, banker.TransferFrom(alice, carl, 700))
124+
urequire.Error(t, teller.TransferFrom(alice, carl, 700))
130125
checkBalances(1000, 0, 0)
131126
checkAllowances(600, 0, 0, 0, 0, 0)
132-
urequire.NoError(t, banker.TransferFrom(alice, carl, 400))
127+
urequire.NoError(t, teller.TransferFrom(alice, carl, 400))
133128
checkBalances(600, 0, 400)
134129
checkAllowances(200, 0, 0, 0, 0, 0)
135130
}

‎examples/gno.land/p/demo/grc/grc20/token_test.gno

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ import (
99
"gno.land/p/demo/urequire"
1010
)
1111

12-
func TestBankImpl(t *testing.T) {
12+
func TestTestImpl(t *testing.T) {
1313
bank, _ := NewToken("Dummy", "DUMMY", 4)
1414
urequire.False(t, bank == nil, "dummy should not be nil")
1515
}
1616

17-
func TestBank(t *testing.T) {
17+
func TestToken(t *testing.T) {
1818
var (
1919
alice = testutils.TestAddress("alice")
2020
bob = testutils.TestAddress("bob")

0 commit comments

Comments
 (0)
Please sign in to comment.