[CRE-491] Cleanup LLO folder: testutils + logger by pavel-raykov · Pull Request #21692 · smartcontractkit/chainlink

pavel-raykov · 2026-03-25T11:59:05Z

No description provided.

github-actions · 2026-03-25T12:00:19Z

I see you updated files related to core. Please run make gocs in the root directory to add a changeset as well as in the text include at least one of the following tags:

#added For any new functionality added.
#breaking_change For any functionality that requires manual action for the node to boot.
#bugfix For bug fixes.
#changed For any change to the existing functionality.
#db_update For any feature that introduces updates to database schema.
#deprecation_notice For any upcoming deprecation functionality.
#internal For changesets that need to be excluded from the final changelog.
#nops For any feature that is NOP facing and needs to be in the official Release Notes for the release.
#removed For any functionality/config that is removed.
#updated For any functionality that is updated.
#wip For any change that is not ready yet and external communication about it should be held off till it is feature complete.

github-actions · 2026-03-25T12:00:38Z

✅ No conflicts with other open PRs targeting develop

trunk-io · 2026-03-25T12:20:37Z

_{View Full Report ↗︎ ⋅ Docs}

cl-sonarqube-production · 2026-03-25T13:47:38Z

Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube

Copilot

Pull request overview

Risk Rating: MEDIUM

This PR cleans up the LLO code/tests to use chainlink-common logger + test helpers (instead of core/logger and core/internal/testutils) and scopes a previously shared HTTP backoff helper into the channel definitions cache.

Changes:

Migrates LLO-related tests to testing.T.Context() and chainlink-common/pkg/logger + chainlink-common/pkg/utils/tests.
Updates mercury transmitter server to use logger.Nop() instead of the core null logger.
Removes core/utils.NewHTTPFetchBackoff and adds an equivalent private helper in the channel definitions cache; removes MustRandBytes from core/internal/testutils.

Scrupulous human review areas:

core/services/llo/keyring.go: logger type/behavior change (logger.Sugared(lggr).Named(...)) in a security-adjacent component (sign/verify).
core/services/llo/mercurytransmitter/server.go: change from corelogger.NullLogger to logger.Nop() (ensure equivalent behavior for codec logging).
core/services/llo/channeldefinitions/onchain_channel_definition_cache.go: retry/backoff behavior relocation (ensure no behavioral drift in fetch retry timing).

Suggested reviewers (per CODEOWNERS):

/core/services/llo/**: @smartcontractkit/data-streams-engineers, @smartcontractkit/core
core/utils/** (falls back to root): @smartcontractkit/foundations, @smartcontractkit/core

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
core/utils/utils.go	Removes shared `NewHTTPFetchBackoff` helper from core utils.
core/services/llo/retirement/retirement_report_cache_test.go	Switches to `chainlink-common` logger in tests.
core/services/llo/report_codecs_test.go	Uses `chainlink-common` test logger helper.
core/services/llo/orm_test.go	Replaces internal testutils usage with `t.Context()` and evm testutils address helper.
core/services/llo/mercurytransmitter/transmitter_test.go	Migrates logger/context/timeout helpers to `chainlink-common`.
core/services/llo/mercurytransmitter/server.go	Swaps null logger to `logger.Nop()` and uses `chainlink-common/pkg/utils`.
core/services/llo/mercurytransmitter/queue_test.go	Migrates observed logger + log assertions to `chainlink-common` helpers.
core/services/llo/mercurytransmitter/persistence_manager_test.go	Migrates observed logger + context/log assertions to `chainlink-common`.
core/services/llo/mercurytransmitter/orm_test.go	Uses `t.Context()` instead of internal testutils.
core/services/llo/keyring_test.go	Switches to `chainlink-common` logger and replaces removed random-bytes helper.
core/services/llo/keyring.go	Switches logger import to `chainlink-common` and adjusts logger wrapping.
core/services/llo/cre/transmitter_test.go	Migrates tests to `chainlink-common` logger helper.
core/services/llo/cleanup_test.go	Migrates cleanup tests to `t.Context()` and `chainlink-common` logger.
core/services/llo/channeldefinitions/static_channel_definitions_cache.go	Import cleanup/reorder while standardizing logger usage.
core/services/llo/channeldefinitions/onchain_channel_definition_cache_test.go	Uses evm testutils import for addresses.
core/services/llo/channeldefinitions/onchain_channel_definition_cache.go	Replaces core utils backoff call with local helper; import cleanup.
core/services/llo/channeldefinitions/channel_definition_cache_factory_test.go	Migrates test logger to `chainlink-common`.
core/services/llo/bm/dummy_transmitter_test.go	Migrates benchmark transmitter test to `chainlink-common` logger/tests helpers.
core/internal/testutils/testutils.go	Removes `MustRandBytes` from internal testutils.

Copilot · 2026-03-25T14:05:52Z

core/services/llo/keyring_test.go

 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3types"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"



This file imports github.com/smartcontractkit/libocr/offchainreporting2plus/types twice (once unaliased as types and again as ocrtypes). Duplicate import paths are a compile error. Keep a single import (either use types.* everywhere or alias it once, e.g. ocrtypes, and update types.OnchainPublicKey accordingly).

Copilot · 2026-03-25T14:05:53Z

core/services/llo/cleanup_test.go

@@ -14,10 +14,9 @@ import (
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/types"


The import block includes github.com/smartcontractkit/libocr/offchainreporting2plus/types twice (unaliased and as ocrtypes). Go forbids importing the same path multiple times, so this test will not compile. Import it once and use a single package name throughout (e.g. replace ocrtypes.Report with types.Report, or vice versa).

Suggested change

"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

Copilot · 2026-03-25T14:05:53Z

core/services/llo/keyring.go

 	llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
 	"github.com/smartcontractkit/chainlink-data-streams/llo/reportcodecs/evm"

-	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"


github.com/smartcontractkit/libocr/offchainreporting2plus/types is imported twice in this file (once as types and again as ocrtypes). That is a compile error. Import the package only once (choose one name) and update the types.*/ocrtypes.* references accordingly.

Copilot · 2026-03-25T14:05:54Z

core/services/llo/mercurytransmitter/server.go

 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	llotypes "github.com/smartcontractkit/chainlink-common/pkg/types/llo"
+	"github.com/smartcontractkit/chainlink-common/pkg/utils"
 	"github.com/smartcontractkit/chainlink-data-streams/llo"


The import block currently includes github.com/smartcontractkit/libocr/offchainreporting2plus/types twice (once as types and once as ocr2types). Go does not allow duplicate import paths, so this file will not compile. Import it once (e.g. as ocr2types) and update the single types.ConfigDigest usage to the chosen name.

Copilot · 2026-03-25T14:05:54Z

core/services/llo/retirement/retirement_report_cache_test.go

@@ -10,7 +10,7 @@ import (
 	ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
 	ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"


The import block brings in github.com/smartcontractkit/libocr/offchainreporting2plus/types twice (as ocr2types and ocrtypes). Go does not allow duplicate import paths, so this test will not compile. Import it once (pick one alias) and update the references accordingly.

Suggested change

ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

minor.

57ee0f8

pavel-raykov changed the title ~~[CRE-491] Cleanup LLO folder: t.Context + logger~~ [CRE-491] Cleanup LLO folder: testutils + logger Mar 25, 2026

minor.

20559c1

minor.

fb014e4

pavel-raykov marked this pull request as ready for review March 25, 2026 13:56

pavel-raykov requested review from a team as code owners March 25, 2026 13:56

pavel-raykov requested review from Copilot and jmank88 March 25, 2026 13:56

product-security-plaid-production bot requested a review from mchain0 March 25, 2026 13:56

pavel-raykov requested review from brunotm and removed request for mchain0 March 25, 2026 13:56

product-security-plaid-production bot requested a review from chris-chainlink March 25, 2026 13:56

Copilot started reviewing on behalf of pavel-raykov March 25, 2026 13:57 View session

Copilot AI reviewed Mar 25, 2026

View reviewed changes

george-dorin approved these changes Mar 25, 2026

View reviewed changes

pavel-raykov enabled auto-merge March 25, 2026 16:24

Fletch153 approved these changes Mar 25, 2026

View reviewed changes

pavel-raykov added this pull request to the merge queue Mar 25, 2026

Merged via the queue into develop with commit 9a03597 Mar 25, 2026
217 of 219 checks passed

pavel-raykov deleted the clean-llo branch March 25, 2026 16:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CRE-491] Cleanup LLO folder: testutils + logger#21692

[CRE-491] Cleanup LLO folder: testutils + logger#21692
pavel-raykov merged 3 commits intodevelopfrom
clean-llo

pavel-raykov commented Mar 25, 2026

Uh oh!

github-actions bot commented Mar 25, 2026

Uh oh!

github-actions bot commented Mar 25, 2026 •

edited

Loading

Uh oh!

trunk-io bot commented Mar 25, 2026 •

edited

Loading

Uh oh!

cl-sonarqube-production bot commented Mar 25, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 25, 2026

Uh oh!

Copilot AI Mar 25, 2026

Uh oh!

Copilot AI Mar 25, 2026

Uh oh!

Copilot AI Mar 25, 2026

Uh oh!

Copilot AI Mar 25, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		@@ -14,10 +14,9 @@ import (
		"github.com/smartcontractkit/libocr/offchainreporting2plus/types"

		@@ -10,7 +10,7 @@ import (
		ocr2types "github.com/smartcontractkit/libocr/offchainreporting2plus/types"
		ocrtypes "github.com/smartcontractkit/libocr/offchainreporting2plus/types"

Conversation

pavel-raykov commented Mar 25, 2026

Uh oh!

github-actions bot commented Mar 25, 2026

Uh oh!

github-actions bot commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

trunk-io bot commented Mar 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cl-sonarqube-production bot commented Mar 25, 2026

Quality Gate passed

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 25, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

github-actions bot commented Mar 25, 2026 •

edited

Loading

trunk-io bot commented Mar 25, 2026 •

edited

Loading