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 bfa8c4b

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

File tree

8 files changed

+58
-58
lines changed

8 files changed

+58
-58
lines changed
 

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ import (
1111
)
1212

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

1818
func TestPrevRealmBankerImpl(t *testing.T) {
19-
bank, _ := NewBank("Dummy", "DUMMY", 4)
19+
bank, _ := NewToken("Dummy", "DUMMY", 4)
2020
banker := PrevRealmBanker(bank)
2121
urequire.False(t, banker == nil)
2222
var _ GRC20 = banker
@@ -29,7 +29,7 @@ func TestBank(t *testing.T) {
2929
carl = testutils.TestAddress("carl")
3030
)
3131

32-
bank, adm := NewBank("Dummy", "DUMMY", 6)
32+
bank, adm := NewToken("Dummy", "DUMMY", 6)
3333

3434
checkBalances := func(aliceEB, bobEB, carlEB uint64) {
3535
t.Helper()
@@ -91,7 +91,7 @@ func TestPrevRealmBanker(t *testing.T) {
9191
bob := testutils.TestAddress("bob")
9292
carl := testutils.TestAddress("carl")
9393

94-
bank, adm := NewBank("Dummy", "DUMMY", 6)
94+
bank, adm := NewToken("Dummy", "DUMMY", 6)
9595
banker := PrevRealmBanker(bank)
9696

9797
checkBalances := func(aliceEB, bobEB, carlEB uint64) {

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
)
1111

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

@@ -21,7 +21,7 @@ func TestBank(t *testing.T) {
2121
carl = testutils.TestAddress("carl")
2222
)
2323

24-
bank, adm := NewBank("Dummy", "DUMMY", 6)
24+
bank, adm := NewToken("Dummy", "DUMMY", 6)
2525

2626
checkBalances := func(aliceEB, bobEB, carlEB uint64) {
2727
t.Helper()

‎examples/gno.land/r/demo/bar20/bar20.gno

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
)
1414

1515
var (
16-
Bank, adm = grc20.NewBank("Bar", "BAR", 4)
17-
UserBanker = grc20.PrevRealmBanker(Bank)
16+
Token, ledger = grc20.NewToken("Bar", "BAR", 4)
17+
UserBanker = grc20.PrevRealmBanker(Bank)
1818
)
1919

2020
func init() {

‎examples/gno.land/r/demo/foo20/foo20.gno

+16-16
Original file line numberDiff line numberDiff line change
@@ -15,65 +15,65 @@ import (
1515
)
1616

1717
var (
18-
Bank, adm = grc20.NewBank("Foo", "FOO", 4)
19-
UserBanker = grc20.PrevRealmBanker(Bank)
20-
owner = ownable.NewWithAddress("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @manfred
18+
Token, ledger = grc20.NewToken("Foo", "FOO", 4)
19+
UserTeller = grc20.PrevRealmTeller(Token)
20+
owner = ownable.NewWithAddress("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq") // @manfred
2121
)
2222

2323
func init() {
24-
adm.Mint(owner.Owner(), 1_000_000*10_000) // @administrator (1M)
25-
grc20reg.Register(Bank, "")
24+
ledger.Mint(owner.Owner(), 1_000_000*10_000) // @administrator (1M)
25+
grc20reg.Register(Token, "")
2626
}
2727

2828
func TotalSupply() uint64 {
29-
return UserBanker.TotalSupply()
29+
return UserTeller.TotalSupply()
3030
}
3131

3232
func BalanceOf(owner pusers.AddressOrName) uint64 {
3333
ownerAddr := users.Resolve(owner)
34-
return UserBanker.BalanceOf(ownerAddr)
34+
return UserTeller.BalanceOf(ownerAddr)
3535
}
3636

3737
func Allowance(owner, spender pusers.AddressOrName) uint64 {
3838
ownerAddr := users.Resolve(owner)
3939
spenderAddr := users.Resolve(spender)
40-
return UserBanker.Allowance(ownerAddr, spenderAddr)
40+
return UserTeller.Allowance(ownerAddr, spenderAddr)
4141
}
4242

4343
func Transfer(to pusers.AddressOrName, amount uint64) {
4444
toAddr := users.Resolve(to)
45-
checkErr(UserBanker.Transfer(toAddr, amount))
45+
checkErr(UserTeller.Transfer(toAddr, amount))
4646
}
4747

4848
func Approve(spender pusers.AddressOrName, amount uint64) {
4949
spenderAddr := users.Resolve(spender)
50-
checkErr(UserBanker.Approve(spenderAddr, amount))
50+
checkErr(UserTeller.Approve(spenderAddr, amount))
5151
}
5252

5353
func TransferFrom(from, to pusers.AddressOrName, amount uint64) {
5454
fromAddr := users.Resolve(from)
5555
toAddr := users.Resolve(to)
56-
checkErr(UserBanker.TransferFrom(fromAddr, toAddr, amount))
56+
checkErr(UserTeller.TransferFrom(fromAddr, toAddr, amount))
5757
}
5858

5959
// Faucet is distributing foo20 tokens without restriction (unsafe).
6060
// For a real token faucet, you should take care of setting limits are asking payment.
6161
func Faucet() {
6262
caller := std.PrevRealm().Addr()
6363
amount := uint64(1_000 * 10_000) // 1k
64-
checkErr(adm.Mint(caller, amount))
64+
checkErr(ledger.Mint(caller, amount))
6565
}
6666

6767
func Mint(to pusers.AddressOrName, amount uint64) {
6868
owner.AssertCallerIsOwner()
6969
toAddr := users.Resolve(to)
70-
checkErr(adm.Mint(toAddr, amount))
70+
checkErr(ledger.Mint(toAddr, amount))
7171
}
7272

7373
func Burn(from pusers.AddressOrName, amount uint64) {
7474
owner.AssertCallerIsOwner()
7575
fromAddr := users.Resolve(from)
76-
checkErr(adm.Burn(fromAddr, amount))
76+
checkErr(ledger.Burn(fromAddr, amount))
7777
}
7878

7979
func Render(path string) string {
@@ -82,11 +82,11 @@ func Render(path string) string {
8282

8383
switch {
8484
case path == "":
85-
return Bank.RenderHome()
85+
return Token.RenderHome()
8686
case c == 2 && parts[0] == "balance":
8787
owner := pusers.AddressOrName(parts[1])
8888
ownerAddr := users.Resolve(owner)
89-
balance := UserBanker.BalanceOf(ownerAddr)
89+
balance := UserTeller.BalanceOf(ownerAddr)
9090
return ufmt.Sprintf("%d\n", balance)
9191
default:
9292
return "404\n"

‎examples/gno.land/r/demo/foo20/foo20_test.gno

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestErrConditions(t *testing.T) {
7171
fn func()
7272
}
7373

74-
adm.Mint(std.Address(admin), 10000)
74+
ledger.Mint(std.Address(admin), 10000)
7575
{
7676
tests := []test{
7777
{"Transfer(admin, 1)", "cannot send transfer to self", func() {
@@ -82,7 +82,7 @@ func TestErrConditions(t *testing.T) {
8282
// calling this package from an outside point of
8383
// view.
8484
adminAddr := std.Address(admin)
85-
if err := adm.Transfer(adminAddr, adminAddr, 1); err != nil {
85+
if err := ledger.Transfer(adminAddr, adminAddr, 1); err != nil {
8686
panic(err)
8787
}
8888
}},

‎examples/gno.land/r/demo/grc20factory/grc20factory.gno

+17-17
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
var instances avl.Tree // symbol -> instance
1515

1616
type instance struct {
17-
bank *grc20.Bank
17+
token *grc20.Token
1818
admin *ownable.Ownable
1919
faucet uint64 // per-request amount. disabled if 0.
2020
}
@@ -30,57 +30,57 @@ func NewWithAdmin(name, symbol string, decimals uint, initialMint, faucet uint64
3030
panic("token already exists")
3131
}
3232

33-
bank := grc20.NewBank(name, symbol, decimals)
33+
token := grc20.NewToken(name, symbol, decimals)
3434
if initialMint > 0 {
3535
bank.Mint(admin, initialMint)
3636
}
3737

3838
inst := instance{
39-
bank: bank,
39+
token: token,
4040
admin: ownable.NewWithAddress(admin),
4141
faucet: faucet,
4242
}
4343
instances.Set(symbol, &inst)
44-
grc20reg.Register(bank, symbol)
44+
grc20reg.Register(token, symbol)
4545
}
4646

4747
func (inst instance) PrevRealmBanker() grc20.GRC20 {
48-
return grc20.PrevRealmBanker(inst.bank)
48+
return grc20.PrevRealmBanker(inst.token)
4949
}
5050

5151
func Bank(symbol string) *grc20.Bank {
5252
inst := mustGetInstance(symbol)
53-
return inst.bank
53+
return inst.token
5454
}
5555

5656
func TotalSupply(symbol string) uint64 {
5757
inst := mustGetInstance(symbol)
58-
return grc20.PrevRealmBanker(inst.bank).TotalSupply()
58+
return grc20.PrevRealmBanker(inst.token).TotalSupply()
5959
}
6060

6161
func BalanceOf(symbol string, owner std.Address) uint64 {
6262
inst := mustGetInstance(symbol)
63-
return grc20.PrevRealmBanker(inst.bank).BalanceOf(owner)
63+
return grc20.PrevRealmBanker(inst.token).BalanceOf(owner)
6464
}
6565

6666
func Allowance(symbol string, owner, spender std.Address) uint64 {
6767
inst := mustGetInstance(symbol)
68-
return grc20.PrevRealmBanker(inst.bank).Allowance(owner, spender)
68+
return grc20.PrevRealmBanker(inst.token).Allowance(owner, spender)
6969
}
7070

7171
func Transfer(symbol string, to std.Address, amount uint64) {
7272
inst := mustGetInstance(symbol)
73-
checkErr(grc20.PrevRealmBanker(inst.bank).Transfer(to, amount))
73+
checkErr(grc20.PrevRealmBanker(inst.token).Transfer(to, amount))
7474
}
7575

7676
func Approve(symbol string, spender std.Address, amount uint64) {
7777
inst := mustGetInstance(symbol)
78-
checkErr(grc20.PrevRealmBanker(inst.bank).Approve(spender, amount))
78+
checkErr(grc20.PrevRealmBanker(inst.token).Approve(spender, amount))
7979
}
8080

8181
func TransferFrom(symbol string, from, to std.Address, amount uint64) {
8282
inst := mustGetInstance(symbol)
83-
checkErr(grc20.PrevRealmBanker(inst.bank).TransferFrom(from, to, amount))
83+
checkErr(grc20.PrevRealmBanker(inst.token).TransferFrom(from, to, amount))
8484
}
8585

8686
// faucet.
@@ -92,19 +92,19 @@ func Faucet(symbol string) {
9292
// FIXME: add limits?
9393
// FIXME: add payment in gnot?
9494
caller := std.PrevRealm().Addr()
95-
checkErr(inst.bank.Mint(caller, inst.faucet))
95+
checkErr(inst.token.Mint(caller, inst.faucet))
9696
}
9797

9898
func Mint(symbol string, to std.Address, amount uint64) {
9999
inst := mustGetInstance(symbol)
100100
inst.admin.AssertCallerIsOwner()
101-
checkErr(inst.bank.Mint(to, amount))
101+
checkErr(inst.token.Mint(to, amount))
102102
}
103103

104104
func Burn(symbol string, from std.Address, amount uint64) {
105105
inst := mustGetInstance(symbol)
106106
inst.admin.AssertCallerIsOwner()
107-
checkErr(inst.bank.Burn(from, amount))
107+
checkErr(inst.token.Burn(from, amount))
108108
}
109109

110110
func Render(path string) string {
@@ -117,12 +117,12 @@ func Render(path string) string {
117117
case c == 1:
118118
symbol := parts[0]
119119
inst := mustGetInstance(symbol)
120-
return inst.bank.RenderHome()
120+
return inst.token.RenderHome()
121121
case c == 3 && parts[1] == "balance":
122122
symbol := parts[0]
123123
inst := mustGetInstance(symbol)
124124
owner := std.Address(parts[2])
125-
balance := grc20.PrevRealmBanker(inst.bank).BalanceOf(owner)
125+
balance := grc20.PrevRealmBanker(inst.token).BalanceOf(owner)
126126
return ufmt.Sprintf("%d", balance)
127127
default:
128128
return "404\n"

‎examples/gno.land/r/demo/tests/test20/test20.gno

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import (
1313
)
1414

1515
var (
16-
Bank, Adm = grc20.NewBank("Test20", "TST", 4)
17-
PrevRealmBanker = grc20.PrevRealmBanker(Bank)
18-
AccountBanker = grc20.AccountBanker(Bank, "")
19-
AccountBankerFoo = grc20.AccountBanker(Bank, "foo")
16+
Token, Ledger = grc20.NewToken("Test20", "TST", 4)
17+
PrevRealmBanker = grc20.PrevRealmBanker(Token)
18+
AccountBanker = grc20.AccountBanker(Token, "")
19+
AccountBankerFoo = grc20.AccountBanker(Token, "foo")
2020
)
2121

2222
// XXX func init() { grc20reg.Register(Pub, "") } // circular dep (testing)

‎examples/gno.land/r/demo/wugnot/wugnot.gno

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ import (
1111
"gno.land/r/demo/users"
1212
)
1313

14-
var Bank, adm = grc20.NewBank("wrapped GNOT", "wugnot", 0)
14+
var Bank, adm = grc20.NewToken("wrapped GNOT", "wugnot", 0)
1515

1616
const (
1717
ugnotMinDeposit uint64 = 1000
1818
wugnotMinDeposit uint64 = 1
1919
)
2020

2121
func init() {
22-
grc20reg.Register(Bank, "")
22+
grc20reg.Register(Token, "")
2323
}
2424

2525
func Deposit() {
@@ -37,7 +37,7 @@ func Withdraw(amount uint64) {
3737

3838
caller := std.PrevRealm().Addr()
3939
pkgaddr := std.CurrentRealm().Addr()
40-
callerBal := Bank.BalanceOf(caller)
40+
callerBal := Token.BalanceOf(caller)
4141
require(amount <= callerBal, ufmt.Sprintf("Insufficient balance: %d available, %d needed.", callerBal, amount))
4242

4343
// send swapped ugnots to qcaller
@@ -53,45 +53,45 @@ func Render(path string) string {
5353

5454
switch {
5555
case path == "":
56-
return Bank.RenderHome()
56+
return Token.RenderHome()
5757
case c == 2 && parts[0] == "balance":
5858
owner := std.Address(parts[1])
59-
balance := Bank.BalanceOf(owner)
59+
balance := Token.BalanceOf(owner)
6060
return ufmt.Sprintf("%d", balance)
6161
default:
6262
return "404"
6363
}
6464
}
6565

66-
func TotalSupply() uint64 { return Bank.TotalSupply() }
66+
func TotalSupply() uint64 { return Token.TotalSupply() }
6767

6868
func BalanceOf(owner pusers.AddressOrName) uint64 {
6969
ownerAddr := users.Resolve(owner)
70-
return Bank.BalanceOf(ownerAddr)
70+
return Token.BalanceOf(ownerAddr)
7171
}
7272

7373
func Allowance(owner, spender pusers.AddressOrName) uint64 {
7474
ownerAddr := users.Resolve(owner)
7575
spenderAddr := users.Resolve(spender)
76-
return Bank.Allowance(ownerAddr, spenderAddr)
76+
return Token.Allowance(ownerAddr, spenderAddr)
7777
}
7878

7979
func Transfer(to pusers.AddressOrName, amount uint64) {
8080
toAddr := users.Resolve(to)
81-
userBanker := grc20.PrevRealmBanker(Bank)
81+
userBanker := grc20.PrevRealmBanker(Token)
8282
checkErr(userBanker.Transfer(toAddr, amount))
8383
}
8484

8585
func Approve(spender pusers.AddressOrName, amount uint64) {
8686
spenderAddr := users.Resolve(spender)
87-
userBanker := grc20.PrevRealmBanker(Bank)
87+
userBanker := grc20.PrevRealmBanker(Token)
8888
checkErr(userBanker.Approve(spenderAddr, amount))
8989
}
9090

9191
func TransferFrom(from, to pusers.AddressOrName, amount uint64) {
9292
fromAddr := users.Resolve(from)
9393
toAddr := users.Resolve(to)
94-
userBanker := grc20.PrevRealmBanker(Bank)
94+
userBanker := grc20.PrevRealmBanker(Token)
9595
checkErr(userBanker.TransferFrom(fromAddr, toAddr, amount))
9696
}
9797

0 commit comments

Comments
 (0)
Please sign in to comment.