core/services/chainlink: normalize feature config (#14324)

smartcontractkit · Sep 4, 2024 · f7fec9c · f7fec9c
1 parent 1ea9f79
commit f7fec9c
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 55 deletions.
diff --git a/core/config/app_config.go b/core/config/app_config.go
@@ -56,8 +56,6 @@ type AppConfig interface {
 	Threshold() Threshold
 	WebServer() WebServer
 	Tracing() Tracing
-
-	FeatureMultiFeedsManagers() bool
 }
 
 type DatabaseBackupMode string

diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
@@ -577,6 +577,7 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 			jobSpawner,
 			keyStore,
 			cfg,
+			cfg.Feature(),
 			cfg.Insecure(),
 			cfg.JobPipeline(),
 			cfg.OCR(),

diff --git a/core/services/chainlink/config_general.go b/core/services/chainlink/config_general.go
@@ -282,10 +282,6 @@ func (g *generalConfig) FeatureFeedsManager() bool {
 	return *g.c.Feature.FeedsManager
 }
 
-func (g *generalConfig) FeatureMultiFeedsManagers() bool {
-	return *g.c.Feature.MultiFeedsManagers
-}
-
 func (g *generalConfig) OCR() config.OCR {
 	return &ocrConfig{c: g.c.OCR}
 }

diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go
diff --git a/core/services/feeds/config.go b/core/services/feeds/config.go
@@ -10,7 +10,10 @@ import (
 type GeneralConfig interface {
 	OCR() coreconfig.OCR
 	Insecure() coreconfig.Insecure
-	FeatureMultiFeedsManagers() bool
+}
+
+type FeatureConfig interface {
+	MultiFeedsManagers() bool
 }
 
 type JobConfig interface {

diff --git a/core/services/feeds/service.go b/core/services/feeds/service.go
@@ -124,6 +124,7 @@ type service struct {
 	ocr2KeyStore        keystore.OCR2
 	jobSpawner          job.Spawner
 	gCfg                GeneralConfig
+	featCfg             FeatureConfig
 	insecureCfg         InsecureConfig
 	jobCfg              JobConfig
 	ocrCfg              OCRConfig
@@ -143,6 +144,7 @@ func NewService(
 	jobSpawner job.Spawner,
 	keyStore keystore.Master,
 	gCfg GeneralConfig,
+	fCfg FeatureConfig,
 	insecureCfg InsecureConfig,
 	jobCfg JobConfig,
 	ocrCfg OCRConfig,
@@ -163,6 +165,7 @@ func NewService(
 		ocr1KeyStore:        keyStore.OCR(),
 		ocr2KeyStore:        keyStore.OCR2(),
 		gCfg:                gCfg,
+		featCfg:             fCfg,
 		insecureCfg:         insecureCfg,
 		jobCfg:              jobCfg,
 		ocrCfg:              ocrCfg,
@@ -187,7 +190,7 @@ type RegisterManagerParams struct {
 // RegisterManager registers a new ManagerService and attempts to establish a
 // connection.
 func (s *service) RegisterManager(ctx context.Context, params RegisterManagerParams) (int64, error) {
-	if s.gCfg.FeatureMultiFeedsManagers() {
+	if s.featCfg.MultiFeedsManagers() {
 		exists, err := s.orm.ManagerExists(ctx, params.PublicKey)
 		if err != nil {
 			return 0, err
@@ -1034,7 +1037,7 @@ func (s *service) Start(ctx context.Context) error {
 			return nil
 		}
 
-		if s.gCfg.FeatureMultiFeedsManagers() {
+		if s.featCfg.MultiFeedsManagers() {
 			s.lggr.Infof("starting connection to %d feeds managers", len(mgrs))
 			for _, mgr := range mgrs {
 				s.connectFeedManager(ctx, mgr, privkey)

diff --git a/core/services/feeds/service_test.go b/core/services/feeds/service_test.go
@@ -194,7 +194,7 @@ func setupTestServiceCfg(t *testing.T, overrideCfg func(c *chainlink.Config, s *
 	keyStore.On("P2P").Return(p2pKeystore)
 	keyStore.On("OCR").Return(ocr1Keystore)
 	keyStore.On("OCR2").Return(ocr2Keystore)
-	svc := feeds.NewService(orm, jobORM, db, spawner, keyStore, gcfg, gcfg.Insecure(), gcfg.JobPipeline(), gcfg.OCR(), gcfg.OCR2(), legacyChains, lggr, "1.0.0", nil)
+	svc := feeds.NewService(orm, jobORM, db, spawner, keyStore, gcfg, gcfg.Feature(), gcfg.Insecure(), gcfg.JobPipeline(), gcfg.OCR(), gcfg.OCR2(), legacyChains, lggr, "1.0.0", nil)
 	svc.SetConnectionsManager(connMgr)
 
 	return &TestService{