Adding missing prom reporter. Post merge fixes

smartcontractkit · Sep 2, 2024 · 10ecf42 · 10ecf42
1 parent 66f42c9
commit 10ecf42
Show file tree

Hide file tree

Showing 25 changed files with 515 additions and 943 deletions.
diff --git a/.mockery.yaml b/.mockery.yaml
@@ -258,14 +258,10 @@ packages:
       ORM:
       Runner:
       PipelineParamUnmarshaler:
-  github.com/smartcontractkit/chainlink/v2/core/services/headreporter:
+  github.com/smartcontractkit/chainlink/v2/core/services/promreporter:
     config:
-      dir: "{{ .InterfaceDir }}"
-      filename: "{{ .InterfaceName | snakecase }}_mock.go"
-      inpackage: true
-      mockname: "Mock{{ .InterfaceName | camelcase }}"
+      dir: core/internal/mocks
     interfaces:
-      HeadReporter:
       PrometheusBackend:
   github.com/smartcontractkit/libocr/commontypes:
     config:

diff --git a/contracts/gas-snapshots/functions.gas-snapshot b/contracts/gas-snapshots/functions.gas-snapshot
@@ -45,7 +45,7 @@ FunctionsCoordinator_SetDONPublicKey:test_SetDONPublicKey_Success() (gas: 88970)
 FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_RevertNotOwner() (gas: 13915)
 FunctionsCoordinator_SetThresholdPublicKey:test_SetThresholdPublicKey_Success() (gas: 513165)
 FunctionsCoordinator_StartRequest:test_StartRequest_RevertIfNotRouter() (gas: 22802)
-FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 150150)
+FunctionsCoordinator_StartRequest:test_StartRequest_Success() (gas: 152650)
 FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessFound() (gas: 15106)
 FunctionsCoordinator__IsTransmitter:test__IsTransmitter_SuccessNotFound() (gas: 22916)
 FunctionsRequest_DEFAULT_BUFFER_SIZE:test_DEFAULT_BUFFER_SIZE() (gas: 3089)
@@ -200,7 +200,7 @@ FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfBlockedSender() (gas: 89013)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfInvalidSigner() (gas: 23620)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientContractIsNotSender() (gas: 1866619)
-FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 26026)
+FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_RevertIfRecipientIsNotSender() (gas: 28526)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForContract() (gas: 1946966)
 FunctionsTermsOfServiceAllowList_AcceptTermsOfService:test_AcceptTermsOfService_SuccessIfAcceptingForSelf() (gas: 104555)
 FunctionsTermsOfServiceAllowList_BlockSender:test_BlockSender_RevertIfNotOwner() (gas: 15535)
@@ -232,10 +232,10 @@ FunctionsTermsOfServiceAllowList_UpdateConfig:test_UpdateConfig_Success() (gas:
 Gas_AcceptTermsOfService:test_AcceptTermsOfService_Gas() (gas: 84725)
 Gas_AddConsumer:test_AddConsumer_Gas() (gas: 79140)
 Gas_CreateSubscription:test_CreateSubscription_Gas() (gas: 73419)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20717)
-Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20157)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501339)
-Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202509)
-Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38524)
-Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 988895)
-Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181579)
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MaximumGas() (gas: 20562)
+Gas_FulfillRequest_DuplicateRequestID:test_FulfillRequest_DuplicateRequestID_MinimumGas() (gas: 20024)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MaximumGas() (gas: 501184)
+Gas_FulfillRequest_Success:test_FulfillRequest_Success_MinimumGas() (gas: 202376)
+Gas_FundSubscription:test_FundSubscription_Gas() (gas: 38518)
+Gas_SendRequest:test_SendRequest_MaximumGas() (gas: 984338)
+Gas_SendRequest:test_SendRequest_MinimumGas() (gas: 181561)
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
@@ -461,6 +461,8 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 		LoopRegistry:               plugins.NewLoopRegistry(lggr, nil),
 		MercuryPool:                mercuryPool,
 		CapabilitiesRegistry:       capabilitiesRegistry,
+		CapabilitiesDispatcher:     dispatcher,
+		CapabilitiesPeerWrapper:    peerWrapper,
 	})
 
 	require.NoError(t, err)

diff --git a/core/internal/mocks/prometheus_backend.go b/core/internal/mocks/prometheus_backend.go