tests passing

node/services/service.go

@@ -49,10 +49,9 @@ func HeaderService(
 	syncer *header.Syncer,
 	p2pSub *header.P2PSubscriber,
 	p2pServer *header.P2PExchangeServer,
-	coreListener *header.CoreListener,
 	ex header.Exchange,
 ) *header.Service {
-	return header.NewHeaderService(syncer, p2pSub, p2pServer, coreListener, ex)
+	return header.NewHeaderService(syncer, p2pSub, p2pServer, ex)
 }
 
 // HeaderExchangeP2P constructs new P2PExchange for headers.

service/header/core_listener_test.go

@@ -30,7 +30,8 @@ func TestCoreListener(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	t.Cleanup(cancel)
 
-	go cl.listen(ctx)
+	err = cl.Start(ctx)
+	require.NoError(t, err)
 
 	// ensure headers are getting broadcasted to the gossipsub topic
 	msg, err := sub.Next(context.Background())

service/header/service.go

@@ -17,21 +17,22 @@ type Service struct {
 	syncer        *Syncer
 	p2pSubscriber *P2PSubscriber
 	p2pServer     *P2PExchangeServer
-	coreListener  *CoreListener
 }
 
+// TODO @renaynay: how will we register core listener on the header Service? It's a part of header service but
+// 	we can't pass it directly to constructor b/c only Bridge nodes provide CoreListener, otherwise it'll always be nil
+// 	maybe we can make it an interface? Still hacky.
+
 // NewHeaderService creates a new instance of header Service.
 func NewHeaderService(
 	syncer *Syncer,
 	p2pSub *P2PSubscriber,
 	p2pServer *P2PExchangeServer,
-	coreListener *CoreListener,
 	ex Exchange) *Service {
 	return &Service{
 		syncer:        syncer,
 		p2pSubscriber: p2pSub,
 		p2pServer:     p2pServer,
-		coreListener:  coreListener,
 		ex:            ex,
 	}
 }