[Keystone] Fix init order for Peer Wrapper and Dispatcher (#13976)

smartcontractkit · Aug 1, 2024 · 610a516 · 610a516
1 parent 94aa60d
commit 610a516
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
@@ -213,17 +213,15 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 			externalPeer := externalp2p.NewExternalPeerWrapper(keyStore.P2P(), cfg.Capabilities().Peering(), opts.DS, globalLogger)
 			signer := externalPeer
 			externalPeerWrapper = externalPeer
-			remoteDispatcher := remote.NewDispatcher(externalPeerWrapper, signer, opts.CapabilitiesRegistry, globalLogger)
-			srvcs = append(srvcs, remoteDispatcher)
-
-			dispatcher = remoteDispatcher
-		} else {
+			dispatcher = remote.NewDispatcher(externalPeerWrapper, signer, opts.CapabilitiesRegistry, globalLogger)
+			srvcs = append(srvcs, externalPeerWrapper) // peer wrapper must be started before dispatcher
+			srvcs = append(srvcs, dispatcher)
+		} else { // tests only
 			dispatcher = opts.CapabilitiesDispatcher
 			externalPeerWrapper = opts.CapabilitiesPeerWrapper
+			srvcs = append(srvcs, externalPeerWrapper)
 		}
 
-		srvcs = append(srvcs, externalPeerWrapper)
-
 		rid := cfg.Capabilities().ExternalRegistry().RelayID()
 		registryAddress := cfg.Capabilities().ExternalRegistry().Address()
 		relayer, err := relayerChainInterops.Get(rid)