chore: clean tori

Signed-off-by: Norman Meier <norman@samourai.coop>
TERITORI · Apr 10, 2024 · 215068d · 215068d
1 parent 9e37291
commit 215068d
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/examples/gno.land/r/demo/teritori/tori/gno.mod b/examples/gno.land/r/demo/teritori/tori/gno.mod
@@ -1,9 +1,10 @@
 module gno.land/r/demo/teritori/tori
 
 require (
-        "gno.land/p/demo/ufmt" v0.0.0-latest
-        "gno.land/p/demo/grc/grc20" v0.0.0-latest
-        "gno.land/r/demo/users" v0.0.0-latest
-        "gno.land/p/demo/teritori/ujson" v0.0.0-latest
-        "gno.land/p/demo/teritori/dao_interfaces" v0.0.0-latest
+	gno.land/p/demo/grc/grc20 v0.0.0-latest
+	gno.land/p/demo/teritori/dao_interfaces v0.0.0-latest
+	gno.land/p/demo/teritori/ujson v0.0.0-latest
+	gno.land/p/demo/ufmt v0.0.0-latest
+	gno.land/p/demo/users v0.0.0-latest
+	gno.land/r/demo/users v0.0.0-latest
 )
diff --git a/examples/gno.land/r/demo/teritori/tori/messages.gno b/examples/gno.land/r/demo/teritori/tori/messages.gno
@@ -6,7 +6,7 @@ import (
 
 	"gno.land/p/demo/teritori/dao_interfaces"
 	"gno.land/p/demo/teritori/ujson"
-	"gno.land/r/demo/users"
+	"gno.land/p/demo/users"
 )
 
 type ExecutableMessageMintTori struct {

diff --git a/examples/gno.land/r/demo/teritori/tori/tori.gno b/examples/gno.land/r/demo/teritori/tori/tori.gno
@@ -6,7 +6,8 @@ import (
 
 	"gno.land/p/demo/grc/grc20"
 	"gno.land/p/demo/ufmt"
-	"gno.land/r/demo/users"
+	"gno.land/p/demo/users"
+	rusers "gno.land/r/demo/users"
 )
 
 var (
@@ -31,15 +32,15 @@ func TotalSupply() uint64 {
 }
 
 func BalanceOf(owner users.AddressOrName) uint64 {
-	balance, err := tori.BalanceOf(owner.Resolve())
+	balance, err := tori.BalanceOf(rusers.Resolve(owner))
 	if err != nil {
 		panic(err)
 	}
 	return balance
 }
 
 func Allowance(owner, spender users.AddressOrName) uint64 {
-	allowance, err := tori.Allowance(owner.Resolve(), spender.Resolve())
+	allowance, err := tori.Allowance(rusers.Resolve(owner), rusers.Resolve(spender))
 	if err != nil {
 		panic(err)
 	}
@@ -50,17 +51,17 @@ func Allowance(owner, spender users.AddressOrName) uint64 {
 
 func Transfer(to users.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	tori.Transfer(caller, to.Resolve(), amount)
+	tori.Transfer(caller, rusers.Resolve(to), amount)
 }
 
 func Approve(spender users.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	tori.Approve(caller, spender.Resolve(), amount)
+	tori.Approve(caller, rusers.Resolve(spender), amount)
 }
 
 func TransferFrom(from, to users.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
-	tori.TransferFrom(caller, from.Resolve(), to.Resolve(), amount)
+	tori.TransferFrom(caller, rusers.Resolve(from), rusers.Resolve(to), amount)
 }
 
 // faucet.
@@ -77,13 +78,13 @@ func Faucet() {
 func Mint(address users.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
-	tori.Mint(address.Resolve(), amount)
+	tori.Mint(rusers.Resolve(address), amount)
 }
 
 func Burn(address users.AddressOrName, amount uint64) {
 	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
-	tori.Burn(address.Resolve(), amount)
+	tori.Burn(rusers.Resolve(address), amount)
 }
 
 // render.
@@ -98,7 +99,7 @@ func Render(path string) string {
 		return tori.RenderHome()
 	case c == 2 && parts[0] == "balance":
 		owner := users.AddressOrName(parts[1])
-		balance, _ := tori.BalanceOf(owner.Resolve())
+		balance, _ := tori.BalanceOf(rusers.Resolve(owner))
 		return ufmt.Sprintf("%d\n", balance)
 	default:
 		return "404\n"