Merge branch 'master' into feat/relay-api-autoshard

waku/v2/protocol/filter/client.go

@@ -24,6 +24,7 @@ import (
 	"github.com/waku-org/go-waku/waku/v2/protocol/subscription"
 	"github.com/waku-org/go-waku/waku/v2/timesource"
 	"go.uber.org/zap"
+	"golang.org/x/exp/slices"
 )
 
 // FilterPushID_v20beta1 is the current Waku Filter protocol identifier used to allow
@@ -227,6 +228,9 @@ func (wf *WakuFilterLightNode) Subscribe(ctx context.Context, contentFilter prot
 	if len(contentFilter.ContentTopics) == 0 {
 		return nil, errors.New("at least one content topic is required")
 	}
+	if slices.Contains[string](contentFilter.ContentTopicsList(), "") {
+		return nil, errors.New("one or more content topics specified is empty")
+	}
 
 	if len(contentFilter.ContentTopics) > MaxContentTopicsPerRequest {
 		return nil, fmt.Errorf("exceeds maximum content topics: %d", MaxContentTopicsPerRequest)
@@ -415,6 +419,10 @@ func (wf *WakuFilterLightNode) Unsubscribe(ctx context.Context, contentFilter pr
 		return nil, errors.New("at least one content topic is required")
 	}
 
+	if slices.Contains[string](contentFilter.ContentTopicsList(), "") {
+		return nil, errors.New("one or more content topics specified is empty")
+	}
+
 	if len(contentFilter.ContentTopics) > MaxContentTopicsPerRequest {
 		return nil, fmt.Errorf("exceeds maximum content topics: %d", MaxContentTopicsPerRequest)
 	}