From eb6d6c12161cdce42bf5179a904e7857c19da8ba Mon Sep 17 00:00:00 2001 From: Aleksandr Bukata Date: Mon, 24 Jun 2024 13:40:08 +0100 Subject: [PATCH] ci fixes --- core/internal/mocks/application.go | 2 +- core/internal/mocks/head_reporter.go | 2 +- core/services/chainlink/mocks/general_config.go | 2 +- core/services/headreporter/head_reporter_test.go | 5 +++-- core/services/headreporter/prometheus_reporter.go | 3 ++- core/services/headreporter/telemetry_reporter.go | 5 +++-- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/core/internal/mocks/application.go b/core/internal/mocks/application.go index cbb8ebaaa04..f845d46ca8d 100644 --- a/core/internal/mocks/application.go +++ b/core/internal/mocks/application.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks diff --git a/core/internal/mocks/head_reporter.go b/core/internal/mocks/head_reporter.go index 9ab09e249e7..fbaf71a1574 100644 --- a/core/internal/mocks/head_reporter.go +++ b/core/internal/mocks/head_reporter.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks diff --git a/core/services/chainlink/mocks/general_config.go b/core/services/chainlink/mocks/general_config.go index 14af5ec9700..22d4deace94 100644 --- a/core/services/chainlink/mocks/general_config.go +++ b/core/services/chainlink/mocks/general_config.go @@ -1,4 +1,4 @@ -// Code generated by mockery v2.43.2. DO NOT EDIT. +// Code generated by mockery v2.42.2. DO NOT EDIT. package mocks diff --git a/core/services/headreporter/head_reporter_test.go b/core/services/headreporter/head_reporter_test.go index 3e17a6d1673..e24c98afc54 100644 --- a/core/services/headreporter/head_reporter_test.go +++ b/core/services/headreporter/head_reporter_test.go @@ -5,13 +5,14 @@ import ( "testing" "time" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "github.com/smartcontractkit/chainlink/v2/core/internal/mocks" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils" "github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/headreporter" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" ) func Test_HeadReporterService(t *testing.T) { diff --git a/core/services/headreporter/prometheus_reporter.go b/core/services/headreporter/prometheus_reporter.go index 4a0cac84fa6..5655461bf64 100644 --- a/core/services/headreporter/prometheus_reporter.go +++ b/core/services/headreporter/prometheus_reporter.go @@ -9,13 +9,14 @@ import ( "github.com/pkg/errors" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" + "go.uber.org/multierr" + "github.com/smartcontractkit/chainlink-common/pkg/sqlutil" txmgrcommon "github.com/smartcontractkit/chainlink/v2/common/txmgr" "github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr" evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm" "github.com/smartcontractkit/chainlink/v2/core/logger" - "go.uber.org/multierr" ) type ( diff --git a/core/services/headreporter/telemetry_reporter.go b/core/services/headreporter/telemetry_reporter.go index a1f4282f8ff..a6cd417f44a 100644 --- a/core/services/headreporter/telemetry_reporter.go +++ b/core/services/headreporter/telemetry_reporter.go @@ -3,14 +3,15 @@ package headreporter import ( "context" + "github.com/smartcontractkit/libocr/commontypes" + "google.golang.org/protobuf/proto" + evmtypes "github.com/smartcontractkit/chainlink/v2/core/chains/evm/types" "github.com/smartcontractkit/chainlink/v2/core/chains/legacyevm" "github.com/smartcontractkit/chainlink/v2/core/logger" "github.com/smartcontractkit/chainlink/v2/core/services/synchronization" "github.com/smartcontractkit/chainlink/v2/core/services/synchronization/telem" "github.com/smartcontractkit/chainlink/v2/core/services/telemetry" - "github.com/smartcontractkit/libocr/commontypes" - "google.golang.org/protobuf/proto" ) type (