fix names

examples/gno.land/r/sys/names/verifier.gno

@@ -7,47 +7,28 @@ import (
 	"strings"
 
 	"gno.land/p/demo/dao"
-	"gno.land/p/demo/ownable"
-	"gno.land/p/demo/pausable"
 
 	"gno.land/r/gov/dao/bridge"
 	"gno.land/r/sys/users"
 )
 
-const (
-	VerifyFuncUpdatedEvent = "VerifyFuncUpdated"
-	adminAddr              = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
-)
-
-type verifierFunc func(enabled bool, address std.Address, name string) bool
+type verifierFunc func(address std.Address, name string) bool
 
-var (
-	checkFunc = defaultVerifier // Callback for the namespace check
+var checkFunc = defaultVerifier // Callback for the namespace check
 
-	// Safe objects
-
-	// Ownable manages the administration of this realm
-	Ownable = ownable.NewWithAddress(adminAddr)
-
-	// Pausable manages whether namespace registration is enabled on-chain or not
-	Pausable = pausable.NewFromOwnable(Ownable)
-)
+const VerifyFuncUpdatedEvent = "VerifyFuncUpdated"
 
 // IsAuthorizedAddressForName ensures that the given address has ownership of the given name.
 func IsAuthorizedAddressForName(address std.Address, name string) bool {
-	return checkFunc(Pausable.IsPaused(), address, name)
+	return checkFunc(address, name)
 }
 
 // defaultVerifyFunction checks the store to see that the
 // user has properly registered the given name.
 // This function considers as valid an `address` that matches the `name`.
-func defaultVerifier(enabled bool, address std.Address, name string) bool {
-	if !enabled {
-		return true
-	}
-
+func defaultVerifier(address std.Address, name string) bool {
 	if strings.TrimSpace(address.String()) == "" || strings.TrimSpace(name) == "" {
-		return false // XXX: possibly redundant?
+		return false
 	}
 
 	// Allow user with their own address as name
@@ -56,19 +37,19 @@ func defaultVerifier(enabled bool, address std.Address, name string) bool {
 		return true
 	}
 
-	/// XXX: add check for r/sys/teams down the line
-
 	// Can be a registered name or an alias
-	userData, deleted := users.ResolveName(name)
-	if userData == nil || deleted {
+	userData := users.ResolveName(name)
+	if userData == nil || userData.IsDeleted() {
 		return false
 	}
 
-	return userData.Addr == address
+	/// XXX: add check for r/sys/teams down the line
+
+	return userData.Addr() == address
 }
 
 // NewVerifyCallExecutor allows updating the verifier function via a GovDAO proposal
-func NewVerifyCallExecutor(newVerifyCall func(enabled bool, address std.Address, name string) bool) dao.Executor {
+func NewVerifyCallExecutor(newVerifyCall func(address std.Address, name string) bool) dao.Executor {
 	callback := func() error {
 		checkFunc = newVerifyCall
 

examples/gno.land/r/sys/names/verifier_test.gno

@@ -14,26 +14,20 @@ import (
 var alice = testutils.TestAddress("alice")
 
 func TestDefaultVerifier(t *testing.T) {
-
-	// Check disabled, any case is true
-	uassert.True(t, defaultVerifier(false, alice, alice.String()))
-	uassert.True(t, defaultVerifier(false, "", alice.String()))
-	uassert.True(t, defaultVerifier(false, adminAddr, "somerandomusername"))
-
 	// Check enabled
 	// username + addr mismatch
-	uassert.False(t, defaultVerifier(true, alice, "notregistered"))
+	uassert.False(t, defaultVerifier(alice, "notregistered"))
 	// PA namespace check
-	uassert.True(t, defaultVerifier(true, alice, alice.String()))
+	uassert.True(t, defaultVerifier(alice, alice.String()))
 
 	// Empty name/address
-	uassert.False(t, defaultVerifier(true, std.Address(""), ""))
+	uassert.False(t, defaultVerifier(std.Address(""), ""))
 
 	//Register proper username
 	std.TestSetRealm(std.NewCodeRealm("gno.land/r/gnoland/users")) // authorized write
 	std.TestSetOrigCaller(std.DerivePkgAddr("gno.land/r/gnoland/users"))
 	urequire.NoError(t, users.RegisterUser("alice", alice))
 
 	// Proper namespace
-	uassert.True(t, defaultVerifier(true, alice, "alice"))
+	uassert.True(t, defaultVerifier(alice, "alice"))
 }