From ee5c99c1bc42210f183da50e75b9127b9d49d6ee Mon Sep 17 00:00:00 2001
From: Norman <norman@samourai.coop>
Date: Tue, 7 Jan 2025 04:18:26 +0100
Subject: [PATCH] chore: improve util

Signed-off-by: Norman <norman@samourai.coop>
---
 gno/p/daocond/daocond_test.gno | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/gno/p/daocond/daocond_test.gno b/gno/p/daocond/daocond_test.gno
index 71527a86e..813aac52f 100644
--- a/gno/p/daocond/daocond_test.gno
+++ b/gno/p/daocond/daocond_test.gno
@@ -227,21 +227,23 @@ func newMockDAO(emitter func(evt daocond.Event)) *mockDAO {
 }
 
 func (m *mockDAO) assignRole(userId string, role string) {
-	if _, ok := m.members[userId]; !ok {
+	_, ok := m.members[userId]
+	if !ok {
 		panic(errors.New("unknown member"))
 	}
-	m.members[userId] = strsadd(m.members[userId], role)
-	if !m.noEvents {
+	m.members[userId], ok = strsadd(m.members[userId], role)
+	if ok && !m.noEvents {
 		m.emitter(&daocond.EventRoleAssigned{UserID: userId, Role: role})
 	}
 }
 
 func (m *mockDAO) unassignRole(userId string, role string) {
-	if _, ok := m.members[userId]; !ok {
+	_, ok := m.members[userId]
+	if !ok {
 		panic(errors.New("unknown member"))
 	}
-	m.members[userId] = strsrm(m.members[userId], role)
-	if !m.noEvents {
+	m.members[userId], ok = strsrm(m.members[userId], role)
+	if ok && !m.noEvents {
 		m.emitter(&daocond.EventRoleUnassigned{UserID: userId, Role: role})
 	}
 }
@@ -268,22 +270,24 @@ func (m *mockDAO) hasRole(memberId string, role string) bool {
 	return false
 }
 
-func strsrm(strs []string, val string) []string {
+func strsrm(strs []string, val string) ([]string, bool) {
+	removed := false
 	res := []string{}
 	for _, str := range strs {
 		if str == val {
+			removed = true
 			continue
 		}
 		res = append(res, str)
 	}
-	return res
+	return res, removed
 }
 
-func strsadd(strs []string, val string) []string {
+func strsadd(strs []string, val string) ([]string, bool) {
 	for _, str := range strs {
 		if str == val {
-			return strs
+			return strs, false
 		}
 	}
-	return append(strs, val)
+	return append(strs, val), true
 }