Merge branch 'develop' into KS-423/prevent-editing-DON-accept-workflo…

…w-field
smartcontractkit · Aug 13, 2024 · 0bab974 · 0bab974
2 parents f1027d6 + eb31cf7
commit 0bab974
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.changeset/ninety-ways-run.md b/.changeset/ninety-ways-run.md
@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#internal speed up keystone e2e tests
diff --git a/.github/workflows/crib-integration-test.yml b/.github/workflows/crib-integration-test.yml
@@ -98,9 +98,9 @@ jobs:
           CRIB_NETWORK: geth
           CRIB_NODES: 5
           GAP_URL: ${{ secrets.GAP_URL }}
-#          SETH_LOG_LEVEL: debug
+          SETH_LOG_LEVEL: info
 #          RESTY_DEBUG: true
-#          TEST_PERSISTENCE: true
+          TEST_PERSISTENCE: true
         run: |-
           go test -v -run TestCRIB
       - name: Destroy CRIB Environment

diff --git a/core/capabilities/integration_tests/keystone_contracts_setup.go b/core/capabilities/integration_tests/keystone_contracts_setup.go
@@ -209,7 +209,7 @@ func setupCapabilitiesRegistryContract(ctx context.Context, t *testing.T, workfl
 	triggerCapabilityConfig := newCapabilityConfig()
 	triggerCapabilityConfig.RemoteConfig = &pb.CapabilityConfig_RemoteTriggerConfig{
 		RemoteTriggerConfig: &pb.RemoteTriggerConfig{
-			RegistrationRefresh: durationpb.New(60000 * time.Millisecond),
+			RegistrationRefresh: durationpb.New(1000 * time.Millisecond),
 			RegistrationExpiry:  durationpb.New(60000 * time.Millisecond),
 			// F + 1
 			MinResponsesToAggregate: uint32(triggerDon.F) + 1,

diff --git a/core/services/chainlink/application.go b/core/services/chainlink/application.go
@@ -214,8 +214,6 @@ func NewApplication(opts ApplicationOpts) (Application, error) {
 			signer := externalPeer
 			externalPeerWrapper = externalPeer
 			remoteDispatcher := remote.NewDispatcher(externalPeerWrapper, signer, opts.CapabilitiesRegistry, globalLogger)
-			srvcs = append(srvcs, remoteDispatcher)
-
 			dispatcher = remoteDispatcher
 		} else {
 			dispatcher = opts.CapabilitiesDispatcher