feat: caller can't remove self

gnolang · Jan 16, 2023 · dac208f · dac208f
1 parent 4055858
commit dac208f
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/examples/gno.land/r/system/names/names.gno b/examples/gno.land/r/system/names/names.gno
@@ -37,6 +37,9 @@ func (s *Space) removeAdmin(admin std.Address) error {
 	if len(s.Admins) == 1 {
 		return errors.New("namespace at least needs one admin")
 	}
+	if isCallerAddress(admin) {
+		return errors.New("cannot remove self")
+	}
 	admins := removeAddress(s.Admins, admin)
 	s.Admins = admins
 	return nil
@@ -49,6 +52,9 @@ func (s *Space) addEditor(newEditor std.Address) {
 }
 
 func (s *Space) removeEditor(editor std.Address) error {
+	if isCallerAddress(editor) {
+		return errors.New("cannot remove self")
+	}
 	editors := removeAddress(s.Editors, editor)
 	s.Editors = editors
 	return nil

diff --git a/examples/gno.land/r/system/names/public_test.gno b/examples/gno.land/r/system/names/public_test.gno
@@ -15,7 +15,7 @@ func TestRegisterNamespace(t *testing.T) {
 	assertTrue(t, containsAddress(s.Admins, creator))
 }
 
-func TestAddAdmins(t *testing.T) {
+func TestAdminFuncs(t *testing.T) {
 	std.TestSetOrigCaller(std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq"))
 	creator := std.GetOrigCaller()
 
@@ -33,7 +33,7 @@ func TestAddAdmins(t *testing.T) {
 	assertTrue(t, containsAddress(s.Admins, test2))
 
 	RemoveAdmin(ns, test1)
-	assertTrue(t, !containsAddress(s.Admins, test1))
+	assertFalse(t, containsAddress(s.Admins, test1))
 	assertTrue(t, containsAddress(s.Admins, test2))
 
 	AddEditor(ns, test1)
@@ -43,8 +43,33 @@ func TestAddAdmins(t *testing.T) {
 	assertTrue(t, !containsAddress(s.Editors, test1))
 }
 
+func TestSpaceMethods(t *testing.T) {
+	std.TestSetOrigCaller(std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq"))
+	creator := std.GetOrigCaller()
+
+	test1 := std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
+	test2 := std.Address("g1r6casl322p5adkmmjjkjea404e7f6w29y6gzwg")
+
+	ns := "test4"
+	Register(ns)
+	s := getSpace(ns)
+
+	assertTrue(t, s.isAdmin(creator))
+	assertTrue(t, s.removeAdmin(creator) != nil)
+
+	s.addAdmin(test1)
+	assertTrue(t, s.removeAdmin(test1) == nil)
+
+}
+
 func assertTrue(t *testing.T, b bool) {
 	if !b {
 		t.Fail()
 	}
 }
+
+func assertFalse(t *testing.T, b bool) {
+	if b {
+		t.Fail()
+	}
+}
diff --git a/examples/gno.land/r/system/names/utils.gno b/examples/gno.land/r/system/names/utils.gno
@@ -43,6 +43,13 @@ func containsAddress(addrs []std.Address, addr std.Address) bool {
 	return false
 }
 
+func isCallerAddress(addr std.Address) bool {
+	if addr == std.GetOrigCaller() {
+		return true
+	}
+	return false
+}
+
 func checkErr(err error) {
 	if err != nil {
 		panic(err)