Tests 4; remove broadcaster logic in MakeFilterLightNode

waku-org · Mar 28, 2024 · ccf8da1 · ccf8da1
1 parent 9a3b023
commit ccf8da1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/waku/v2/protocol/filter/filter_proto_ident_test.go b/waku/v2/protocol/filter/filter_proto_ident_test.go
@@ -231,7 +231,7 @@ func (s *FilterTestSuite) TestIncorrectSubscribeIdentifier() {
 	s.testTopic = defaultTestPubSubTopic
 	s.testContentTopic = defaultTestContentTopic
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, false)
 
@@ -270,7 +270,7 @@ func (s *FilterTestSuite) TestIncorrectPushIdentifier() {
 	s.testTopic = defaultTestPubSubTopic
 	s.testContentTopic = defaultTestContentTopic
 
-	s.lightNode = s.MakeWakuFilterLightNode(true)
+	s.lightNode = s.MakeWakuFilterLightNode()
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, false)
 

diff --git a/waku/v2/protocol/filter/filter_subscribe_test.go b/waku/v2/protocol/filter/filter_subscribe_test.go
@@ -119,7 +119,7 @@ func (s *FilterTestSuite) TestMultiPubSubMultiContentTopic() {
 	// Create test context
 	s.ctx, s.ctxCancel = context.WithTimeout(context.Background(), 20*time.Second) // Test can't exceed 20 seconds
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, true)
 
@@ -308,7 +308,7 @@ func (s *FilterTestSuite) TestSubscribeMultipleLightNodes() {
 	// Create test context
 	s.ctx, s.ctxCancel = context.WithTimeout(context.Background(), 10*time.Second) // Test can't exceed 10 seconds
 
-	lightNode2 := s.StartNode(s.MakeWakuFilterLightNode(true))
+	lightNode2 := s.StartNode(s.MakeWakuFilterLightNode())
 
 	// Connect node2
 	lightNode2.h.Peerstore().AddAddr(s.fullNodeHost.ID(), tests.GetHostAddress(s.fullNodeHost), peerstore.PermanentAddrTTL)

diff --git a/waku/v2/protocol/filter/filter_test.go b/waku/v2/protocol/filter/filter_test.go
@@ -130,17 +130,14 @@ func (s *FilterTestSuite) MakeWakuFilterFullNode(topic string, withRegisterAll b
 	return relayData.WakuRelay, node2Filter
 }
 
-func (s *FilterTestSuite) MakeWakuFilterLightNode(withBroadcaster bool) *WakuFilterLightNode {
+func (s *FilterTestSuite) MakeWakuFilterLightNode() *WakuFilterLightNode {
 	port, err := tests.FindFreePort(s.T(), "", 5)
 	s.Require().NoError(err)
 
 	host, err := tests.MakeHost(context.Background(), port, rand.Reader)
 	s.Require().NoError(err)
-	var b relay.Broadcaster
-	if withBroadcaster {
-		b = relay.NewBroadcaster(10)
-		s.Require().NoError(b.Start(context.Background()))
-	}
+	b := relay.NewBroadcaster(10)
+	s.Require().NoError(b.Start(context.Background()))
 	filterPush := NewWakuFilterLightNode(b, nil, timesource.NewDefaultClock(), prometheus.DefaultRegisterer, s.Log)
 	filterPush.SetHost(host)
 	s.lightNodeHost = host
@@ -372,7 +369,7 @@ func (s *FilterTestSuite) SetupTest() {
 	s.testTopic = defaultTestPubSubTopic
 	s.testContentTopic = defaultTestContentTopic
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	//TODO: Add tests to verify broadcaster.
 
@@ -435,7 +432,7 @@ func (s *FilterTestSuite) TestStartStop() {
 
 	var wg sync.WaitGroup
 	wg.Add(2)
-	s.lightNode = s.MakeWakuFilterLightNode(false)
+	s.lightNode = s.MakeWakuFilterLightNode()
 
 	stopNode := func() {
 		for i := 0; i < 100000; i++ {
@@ -479,7 +476,7 @@ func (s *FilterTestSuite) TestAutoShard() {
 	s.testContentTopic = cTopic1Str
 	s.testTopic = pubSubTopic.String()
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(false))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(pubSubTopic.String(), false)
 
 	s.lightNodeHost.Peerstore().AddAddr(s.fullNodeHost.ID(), tests.GetHostAddress(s.fullNodeHost), peerstore.PermanentAddrTTL)

diff --git a/waku/v2/protocol/filter/filter_unsubscribe_test.go b/waku/v2/protocol/filter/filter_unsubscribe_test.go
@@ -88,7 +88,7 @@ func (s *FilterTestSuite) TestUnsubscribeMultiPubSubMultiContentTopic() {
 
 	s.ctx, s.ctxCancel = context.WithTimeout(context.Background(), 20*time.Second)
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, true)
 
@@ -128,7 +128,7 @@ func (s *FilterTestSuite) TestUnsubscribeErrorHandling() {
 
 	s.ctx, s.ctxCancel = context.WithTimeout(context.Background(), 20*time.Second)
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, true)
 
@@ -229,7 +229,7 @@ func (s *FilterTestSuite) TestUnsubscribeAllDiffPubSubContentTopics() {
 
 	s.ctx, s.ctxCancel = context.WithTimeout(context.Background(), 20*time.Second)
 
-	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode(true))
+	s.lightNode = s.StartNode(s.MakeWakuFilterLightNode())
 
 	s.relayNode, s.fullNode = s.MakeWakuFilterFullNode(s.testTopic, true)