Fix deleting pubsub topics; only allow adding unique topics

waku-org · Sep 22, 2023 · 201e1b1 · 201e1b1
1 parent a84701a
commit 201e1b1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/waku/v2/peerstore/waku_peer_store.go b/waku/v2/peerstore/waku_peer_store.go
@@ -155,6 +155,11 @@ func (ps *WakuPeerstoreImpl) AddPubSubTopic(p peer.ID, topic string) error {
 	if err != nil {
 		return err
 	}
+	for _, t := range existingTopics {
+		if t == topic {
+			return errors.New("Pubsub topic already exists")
+		}
+	}
 	existingTopics = append(existingTopics, topic)
 	return ps.peerStore.Put(p, peerPubSubTopics, existingTopics)
 }
@@ -170,8 +175,11 @@ func (ps *WakuPeerstoreImpl) RemovePubSubTopic(p peer.ID, topic string) error {
 		return nil
 	}
 
-	for i := range existingTopics {
-		existingTopics = append(existingTopics[:i], existingTopics[i+1:]...)
+	for i, t := range existingTopics {
+		if t == topic {
+			existingTopics = append(existingTopics[:i], existingTopics[i+1:]...)
+			break
+		}
 	}
 	err = ps.SetPubSubTopics(p, existingTopics)
 	if err != nil {