chore(cre): refactor startup (#16287)

* chore(cre): refactor startup * cleanup
smartcontractkit · Feb 13, 2025 · 073eac4 · 073eac4
1 parent 399a3cd
commit 073eac4
Show file tree

Hide file tree

Showing 4 changed files with 240 additions and 162 deletions.
diff --git a/.changeset/mighty-schools-eat.md b/.changeset/mighty-schools-eat.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal refactor app startup using cre services
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
@@ -305,7 +305,12 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 
 	restrictedClient := clhttp.NewRestrictedHTTPClient(cfg.Database(), appLggr)
 	externalInitiatorManager := webhook.NewExternalInitiatorManager(ds, unrestrictedClient)
+	creOpts := chainlink.CREOpts{
+		CapabilitiesRegistry: capabilitiesRegistry,
+	}
 	return chainlink.NewApplication(chainlink.ApplicationOpts{
+		CREOpts: creOpts,
+
 		Config:                     cfg,
 		DS:                         ds,
 		KeyStore:                   keyStore,
@@ -323,7 +328,6 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 		MercuryPool:                mercuryPool,
 		RetirementReportCache:      retirementReportCache,
 		LLOTransmissionReaper:      lloReaper,
-		CapabilitiesRegistry:       capabilitiesRegistry,
 	})
 }
 

diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
@@ -488,7 +488,15 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 	if err != nil {
 		t.Fatal(err)
 	}
+	creOpts := chainlink.CREOpts{
+		CapabilitiesRegistry:    capabilitiesRegistry,
+		CapabilitiesDispatcher:  dispatcher,
+		CapabilitiesPeerWrapper: peerWrapper,
+		FetcherFunc:             syncerFetcherFunc,
+		FetcherFactoryFn:        computeFetcherFactory,
+	}
 	appInstance, err := chainlink.NewApplication(chainlink.ApplicationOpts{
+		CREOpts:                    creOpts,
 		Config:                     cfg,
 		MailMon:                    mailMon,
 		DS:                         ds,
@@ -503,12 +511,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 		SecretGenerator:            MockSecretGenerator{},
 		LoopRegistry:               plugins.NewTestLoopRegistry(lggr),
 		MercuryPool:                mercuryPool,
-		CapabilitiesRegistry:       capabilitiesRegistry,
-		CapabilitiesDispatcher:     dispatcher,
-		CapabilitiesPeerWrapper:    peerWrapper,
 		NewOracleFactoryFn:         newOracleFactoryFn,
-		FetcherFunc:                syncerFetcherFunc,
-		FetcherFactoryFn:           computeFetcherFactory,
 		RetirementReportCache:      retirementReportCache,
 		LLOTransmissionReaper:      llo.NewTransmissionReaper(ds, lggr, cfg.Mercury().Transmitter().ReaperFrequency().Duration(), cfg.Mercury().Transmitter().ReaperMaxAge().Duration()),
 	})