Skip to content

[CRE-491] Prepare relay/evm files to be moved to chainlink-evm#22650

Merged
pavel-raykov merged 4 commits into
developfrom
prepare-evm
May 26, 2026
Merged

[CRE-491] Prepare relay/evm files to be moved to chainlink-evm#22650
pavel-raykov merged 4 commits into
developfrom
prepare-evm

Conversation

@pavel-raykov
Copy link
Copy Markdown
Collaborator

@pavel-raykov pavel-raykov commented May 26, 2026

  1. Prepare config_poller_test.go to be left behind since it is quarantined. (Moved to the evm_test package by exposing NewConfigPollerWithParams instead of the private newConfigPoller)
  2. Prepare evm_service_test.go to be moved to chainlink-evm. (Eliminated its dependency on core/services/keystore by mocking directly the underlying AddressLister from chainlink-evm instead of the custom keyStoreMock based on Eth's service mock)

@pavel-raykov pavel-raykov changed the title [CRE-491] Prepare relay/evm files to be moved under chainlink-evm [CRE-491] Prepare relay/evm files to be moved to chainlink-evm May 26, 2026
@github-actions
Copy link
Copy Markdown
Contributor

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
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 26, 2026

✅ No conflicts with other open PRs targeting develop

@pavel-raykov pavel-raykov marked this pull request as ready for review May 26, 2026 20:02
@pavel-raykov pavel-raykov requested review from a team as code owners May 26, 2026 20:03
Copilot AI review requested due to automatic review settings May 26, 2026 20:03
@trunk-io
Copy link
Copy Markdown

trunk-io Bot commented May 26, 2026

Static BadgeStatic BadgeStatic BadgeStatic Badge

Failed Test Failure Summary Logs
TestRMNCurseOneConnectedLanesSolana The test failed during the setup of a Solana test environment, likely due to issues with container creation or program deployment. Logs ↗︎

View Full Report ↗︎Docs

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Risk Rating: LOW

Prepares the EVM relay code for extraction to chainlink-evm by reducing test coupling to internal packages and exposing a constructor needed by quarantined tests that will remain in this repo.

Changes:

  • Added a keys.AddressLister mock and refactored evm_service_test.go to use it instead of keystore mocks.
  • Exported a config poller constructor variant so config_poller_test.go can move to evm_test (quarantine-friendly).
  • Updated .mockery.yaml to generate the new AddressLister mock.

Areas requiring scrupulous human review:

  • Public surface changes in core/services/relay/evm/config_poller.go (exported constructor) to ensure the intended API shape is correct for long-term maintenance and extraction.
  • Mockery configuration correctness for chainlink-evm/pkg/keys (since it targets an external module interface).

Reviewed changes

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

Show a summary per file
File Description
core/services/relay/evm/types/mocks/address_lister.go Adds a mockery-generated mock for keys.AddressLister to decouple tests from keystore.
core/services/relay/evm/evm_service_test.go Replaces keystore-based enabled-address mocking with AddressLister mocking.
core/services/relay/evm/config_poller.go Exports a constructor needed by evm_test-package tests.
core/services/relay/evm/config_poller_test.go Moves test to evm_test and updates references to exported APIs.
.mockery.yaml Configures mockery generation for chainlink-evm/pkg/keys.AddressLister.
Files not reviewed (1)
  • core/services/relay/evm/types/mocks/address_lister.go: Language not supported

Comment thread core/services/relay/evm/config_poller.go Outdated
Comment thread core/services/relay/evm/config_poller_test.go
@cl-sonarqube-production
Copy link
Copy Markdown

@pavel-raykov pavel-raykov enabled auto-merge May 26, 2026 20:45
@pavel-raykov pavel-raykov added this pull request to the merge queue May 26, 2026
Merged via the queue into develop with commit d501b9a May 26, 2026
211 of 214 checks passed
@pavel-raykov pavel-raykov deleted the prepare-evm branch May 26, 2026 21:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants