chore: fixup

Signed-off-by: moul <94029+moul@users.noreply.github.com>
gnolang · Jul 5, 2024 · 3f83d01 · 3f83d01
1 parent e1a79fe
commit 3f83d01
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 66 deletions.
diff --git a/examples/gno.land/r/demo/bar20/bar20.gno b/examples/gno.land/r/demo/bar20/bar20.gno
@@ -9,6 +9,7 @@ import (
 
 	"gno.land/p/demo/grc/grc20"
 	"gno.land/p/demo/ufmt"
+	"gno.land/r/demo/grc20reg"
 )
 
 var (
@@ -19,6 +20,7 @@ var (
 func init() {
 	banker = grc20.NewAdminToken("Bar", "BAR", 4)
 	Token = banker.GRC20()
+	grc20reg.Register(token, "")
 }
 
 func Faucet() string {

diff --git a/examples/gno.land/r/demo/bar20/gno.mod b/examples/gno.land/r/demo/bar20/gno.mod
@@ -4,4 +4,5 @@ require (
 	gno.land/p/demo/grc/grc20 v0.0.0-latest
 	gno.land/p/demo/testutils v0.0.0-latest
 	gno.land/p/demo/ufmt v0.0.0-latest
+	gno.land/r/demo/grc20reg v0.0.0-latest
 )
diff --git a/examples/gno.land/r/demo/foo20/foo20.gno b/examples/gno.land/r/demo/foo20/foo20.gno
@@ -18,11 +18,9 @@ var (
 
 func init() {
 	foo = grc20.NewAdminToken("Foo", "FOO", 4)
-	pub := foo.GRC20()
-	proxy := grc20reg.Proxify(pub)
-	grc20reg.Register(proxy.GetName, "")
 	foo.Mint(admin, 1000000*10000)                                    // @administrator (1M)
 	foo.Mint("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq", 10000*10000) // @manfred (10k)
+	grc20reg.Register(foo.GRC20(), "")
 }
 
 // method proxies as public functions.

diff --git a/examples/gno.land/r/demo/grc20factory/grc20factory.gno b/examples/gno.land/r/demo/grc20factory/grc20factory.gno
@@ -7,6 +7,7 @@ import (
 
 	"gno.land/p/demo/avl"
 	"gno.land/p/demo/grc/grc20"
+	"gno.land/r/demo/grc20reg"
 )
 
 // XXX: the p/grc20 library needs a refactor to change names (i.e., adminToken)
@@ -36,6 +37,7 @@ func NewTokenWithAdmin(name, symbol string, decimals uint, initialMint uint64, a
 		admin:      admin,
 	}
 	tokens.Set(symbol, &t)
+	grc20reg.Register(newToken.GRC20(), symbol)
 }
 
 // method proxies as public functions.

diff --git a/examples/gno.land/r/demo/grc20reg/grc20reg.gno b/examples/gno.land/r/demo/grc20reg/grc20reg.gno
@@ -9,16 +9,12 @@ import (
 	"gno.land/p/demo/ufmt"
 )
 
-var registry = avl.NewTree() // pkg path -> IGRC20
-
-// func Register(getName func() string, slug string) {
+var registry = avl.NewTree() // rlmPath[.slug] -> IGRC20
 
 func Register(token grc20.IGRC20, slug string) {
-	// proxy := tmpproxy{getName: getName}
-	proxy := Proxify(token)
 	rlmPath := std.PrevRealm().PkgPath()
 	key := fqname.Construct(rlmPath, slug)
-	registry.Set(key, proxy)
+	registry.Set(key, token)
 	std.Emit(
 		registerEvent,
 		"pkgpath", rlmPath,

diff --git a/examples/gno.land/r/demo/grc20reg/tmp_proxy.gno b/examples/gno.land/r/demo/grc20reg/tmp_proxy.gno