Fix tests

pkg/config/options.go

@@ -6,6 +6,20 @@ import (
 	"github.com/masa-finance/masa-oracle/pkg/workers"
 )
 
+var constantOptions = []node.Option{
+	node.WithOracleProtocol(OracleProtocol),
+	node.WithNodeDataSyncProtocol(NodeDataSyncProtocol),
+	node.WithNodeGossipTopic(NodeGossipTopic),
+	node.WithRendezvous(Rendezvous),
+	node.WithPageSize(PageSize),
+}
+
+// WithConstantOptions adds options that are set to constant values. We need to add them to
+// the node to avoid a dependency loop.
+func WithConstantOptions(nodes ...node.Option) []node.Option {
+	return append(nodes, constantOptions...)
+}
+
 func InitOptions(cfg *AppConfig) ([]node.Option, *workers.WorkHandlerManager, *pubsub.PublicKeySubscriptionHandler) {
 	// WorkerManager configuration
 	workerManagerOptions := []workers.WorkerOptionFunc{
@@ -17,7 +31,7 @@ func InitOptions(cfg *AppConfig) ([]node.Option, *workers.WorkHandlerManager, *p
 		cachePath = cfg.MasaDir + "/cache"
 	}
 
-	masaNodeOptions := []node.Option{
+	masaNodeOptions := WithConstantOptions(
 		node.EnableStaked,
 		//	WithService(),
 		node.WithEnvironment(cfg.Environment),
@@ -27,13 +41,8 @@ func InitOptions(cfg *AppConfig) ([]node.Option, *workers.WorkHandlerManager, *p
 		node.WithMasaDir(cfg.MasaDir),
 		node.WithCachePath(cachePath),
 		node.WithKeyManager(cfg.KeyManager),
-		node.WithOracleProtocol(OracleProtocol),
-		node.WithNodeDataSyncProtocol(NodeDataSyncProtocol),
-		node.WithNodeGossipTopic(NodeGossipTopic),
-		node.WithRendezvous(Rendezvous),
-		node.WithPageSize(PageSize),
 		node.WithWorkerProtocol(WorkerProtocol),
-	}
+	)
 
 	if cfg.TwitterScraper {
 		workerManagerOptions = append(workerManagerOptions, workers.EnableTwitterWorker)

pkg/pubsub/manager.go

@@ -83,7 +83,7 @@ func (sm *Manager) AddSubscription(topicName string, handler types.SubscriptionH
 		for {
 			msg, err := sub.Next(sm.ctx)
 			if err != nil {
-				logrus.Errorf("[-] Error reading from topic: %v", err)
+				logrus.Errorf("[-] AddSubscription: Error reading from topic: %v", err)
 				if errors.Is(err, context.Canceled) {
 					return
 				}
@@ -221,7 +221,7 @@ func (sm *Manager) Subscribe(topicName string, handler types.SubscriptionHandler
 		for {
 			msg, err := sub.Next(sm.ctx)
 			if err != nil {
-				logrus.Errorf("[-] Error reading from topic: %v", err)
+				logrus.Errorf("[-] Subscribe: Error reading from topic: %v", err)
 				if errors.Is(err, context.Canceled) {
 					return
 				}

pkg/tests/integration/tracker_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 
 	. "github.com/masa-finance/masa-oracle/node"
+	"github.com/masa-finance/masa-oracle/pkg/config"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -19,8 +20,10 @@ var _ = Describe("Oracle integration tests", func() {
 
 			n, err := NewOracleNode(
 				ctx,
-				EnableStaked,
-				EnableRandomIdentity,
+				config.WithConstantOptions(
+					EnableStaked,
+					EnableRandomIdentity,
+				)...,
 			)
 			Expect(err).ToNot(HaveOccurred())
 
@@ -36,10 +39,13 @@ var _ = Describe("Oracle integration tests", func() {
 			}
 
 			By(fmt.Sprintf("Generating second node with bootnodes %+v", bootNodes))
-			n2, err := NewOracleNode(ctx,
-				EnableStaked,
-				WithBootNodes(bootNodes...),
-				EnableRandomIdentity,
+			n2, err := NewOracleNode(
+				ctx,
+				config.WithConstantOptions(
+					EnableStaked,
+					WithBootNodes(bootNodes...),
+					EnableRandomIdentity,
+				)...,
 			)
 			Expect(err).ToNot(HaveOccurred())
 			Expect(n.Host.ID()).ToNot(Equal(n2.Host.ID()))

pkg/tests/node_data/node_data_tracker_test.go

@@ -8,6 +8,7 @@ import (
 	. "github.com/onsi/gomega"
 
 	. "github.com/masa-finance/masa-oracle/node"
+	"github.com/masa-finance/masa-oracle/pkg/config"
 	"github.com/masa-finance/masa-oracle/pkg/pubsub"
 )
 
@@ -16,8 +17,10 @@ var _ = Describe("NodeDataTracker", func() {
 		It("should correctly update NodeData Twitter fields", func() {
 			testNode, err := NewOracleNode(
 				context.Background(),
-				EnableStaked,
-				EnableRandomIdentity,
+				config.WithConstantOptions(
+					EnableStaked,
+					EnableRandomIdentity,
+				)...,
 			)
 			Expect(err).NotTo(HaveOccurred())