Clean up lots of dead/deprecated CCIPReader code by ogtownsend · Pull Request #1573 · smartcontractkit/chainlink-ccip

ogtownsend · 2026-01-16T18:52:38Z

core ref: 49b1008db01ddf137a8abe4b507cdfd85f0461ca

Core PR: smartcontractkit/chainlink#20830

With the migration to ChainAccessor, this PR:

Deletes config_poller.go in favor of v2
Deletes a lot of process...Config() related functions in ccip.go that are now handled by the DefaultAccessor
Updates ContractAddresses to use the cl-common type

ogtownsend · 2026-01-16T23:37:47Z

pkg/reader/config_poller_v2.go

Additions in this file are from config_poller.go that config_poller_v2.go uses

…p-reader-code

Copilot

Pull request overview

This PR removes deprecated and unused CCIPReader code following a migration to a v2 config poller and the DefaultAccessor pattern.

Changes:

Deleted the v1 config poller implementation (config_poller.go) and its extensive test suite
Removed deprecated methods including GetDestChainFeeComponents(), LinkPriceUSD(), and several process...Config() helper functions
Updated ContractAddresses type references to use the common library type cciptypes.ContractAddresses

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
pkg/reader/config_poller.go	Entire v1 config poller implementation deleted
pkg/reader/config_poller_test.go	All v1 config poller tests removed
pkg/reader/config_poller_v2.go	Added interface definition, constants, and helper functions previously in v1
pkg/reader/ccip.go	Removed deprecated methods and internal interfaces used only by v1 poller
pkg/reader/ccip_test.go	Removed tests for deleted functionality and updated type references
pkg/reader/ccip_interface.go	Removed deprecated method signatures from interface
pkg/reader/observed_ccip.go	Removed wrapper for deprecated `GetDestChainFeeComponents()`
pkg/reader/observed_ccip_test.go	Removed test for deprecated method wrapper
pkg/ocrtypecodec/v1/translate.go	Updated type reference from local to common library
pkg/ocrtypecodec/v1/v1_test.go	Updated import and type reference
internal/plugincommon/discovery/*	Updated type references throughout discovery processor
mocks/pkg/reader/ccip_reader.go	Removed mock implementations for deprecated methods
internal/mocks/inmem/ccipreader_inmem.go	Removed in-memory implementations of deprecated methods
execute/factory_test.go	Updated type reference in test
commit/factory_test.go	Updated type reference in test
commit/plugin_roledon_e2e_test.go	Updated type references in e2e test

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-20T17:42:48Z

pkg/reader/ccip_test.go

 	chainA = cciptypes.ChainSelector(1)
 	chainB = cciptypes.ChainSelector(2)
 	chainC = cciptypes.ChainSelector(3)


The removal of chainD constant suggests it was only used in the deleted config_poller_test.go. However, verify that chainD is not used elsewhere in the codebase to ensure no broken references remain.

* Clean up lots of dead CCIPReader code * lint and regen * fix processor test * lint and fix more tests * make generate * update discovery tests

…p-reader-code

github-actions · 2026-01-27T00:29:47Z

Metric	`ogt/clean-up-dead-ccip-reader-code`	`main`
Coverage	69.8%	69.6%

* Bump Go deps and fix NPM deps (#1570) * carpenter * Delete package-lock.json * rm unused override * move to dev deps * [CRE-491] Bump common and other deps (#1576) * gomods. * gomods. * Minor. * Code (#1562) * Add more clear instructions to seqno consensus failure log (#1572) * CCIP-8527: Adding operations and sequences for token governor contract (#1579) * CCIP-8527: Adding operations and sequences for token governor contract * review comment * review commnet -ai * [CRE-491] Delete unused consts pkg (instead we use its copy from common) (#1577) * Minor. * Minor. * Minor. * chore: trigger pipeline * chore: trigger pipeline * Minor. * chore: trigger pipeline * Minor. * Minor. * Minor. * chore: trigger pipeline * Add GasLimit to commit offchain config (#1598) * Add GasLimit to commit offchain plugin * rename to EVMGasLimit * error on the commit plugin if rmn is enabled (#1587) * error on the commit plugin if rmn is enabled * fix tests * update test * Ccip-8991 one environment for forked and local chains (#1595) * one environment * updates * Ccip-8552 Adding metadata as onchain output (#1601) * adding metadata as onchain output * matching with develop * handle conflicts * Clean up lots of dead/deprecated CCIPReader code (#1573) * Clean up lots of dead CCIPReader code * lint and regen * fix processor test * lint and fix more tests * make generate * update discovery tests * Migrate devenv to test adapters (#1589) * Migrate devenv to test adapters * fixes: EVM tests and Solana->EVM pass again * fix gas limits * Fix solana->evm and evm->solana * Revert change * goimports -w -local github.com/smartcontractkit/chainlink-ccip . * Remove local replaces * go mod fixup * fix lint * Deduplicate code * Fix lints * Fix some of the solana lints * cleanup * Remove unnecessary generics * feat: implement token api for evm 1.6 (#1588) * feat: implement token api for evm 1.6 * feat: add integration test, refactor evm token adapter impl, fix token pool qualifier bug * chore: reword comment * fix: do not use token symbol for token pool qualifier * chore: add more EVM token expansion checks * fix: gomodtidy * chore: add more comments and refactor GetToken calls * Refactor go bindings and deployment evm (#1578) * Refactor go bindings and deployment evm * fix ping pong * Fix tests * Fix mock Import * review comments * Replace factory bnmerc20 with bnmerc20 * more test has factory bnmerc20 * Remove option to deploy factory_burn_mint_erc20 directly * lint fix * make generate * go sum * Fix mocks * Fix imports * Use correct token for testing * Modify owner * Test --------- Co-authored-by: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com> * bump cl-ton version and update tooling adapter (#1604) * bump cl-ton version and update tooling adapter * bump dependency for devenv * bump mod * update modgraph --------- Co-authored-by: Jonghyeon Park <jadepark.dev@gmail.com> * bump mcms, fix ref (#1609) --------- Co-authored-by: pavel-raykov <165708424+pavel-raykov@users.noreply.github.com> Co-authored-by: Oliver Townsend <133903322+ogtownsend@users.noreply.github.com> Co-authored-by: Balamurali Gopalswami <167726375+b-gopalswami@users.noreply.github.com> Co-authored-by: Abdelrahman Soliman (Boda) <2677789+asoliman92@users.noreply.github.com> Co-authored-by: Austin <107539019+0xAustinWang@users.noreply.github.com> Co-authored-by: Anindita Ghosh <88458927+AnieeG@users.noreply.github.com> Co-authored-by: Blaž Hrastnik <blaz@mxxn.io> Co-authored-by: Chris De Leon <147140544+chris-de-leon-cll@users.noreply.github.com> Co-authored-by: Agustina Aldasoro <agusaldasoro@users.noreply.github.com> Co-authored-by: Balamurali Gopalswami <balamurali.gopalswami@smartcontract.com> Co-authored-by: Joe Huang <joe.huang@smartcontract.com> Co-authored-by: Jonghyeon Park <jadepark.dev@gmail.com>

ogtownsend added 3 commits January 16, 2026 10:52

Clean up lots of dead CCIPReader code

7897963

lint and regen

7acabb2

fix processor test

8f07a8c

ogtownsend mentioned this pull request Jan 16, 2026

Bump cl-ccip and update CCIPReader tests smartcontractkit/chainlink#20830

Merged

ogtownsend added 3 commits January 16, 2026 14:35

lint and fix more tests

5d21870

make generate

d5a7a8d

update discovery tests

67e5888

ogtownsend commented Jan 16, 2026

View reviewed changes

pkg/reader/config_poller_v2.go

Copy link

Contributor Author

ogtownsend Jan 16, 2026

Choose a reason for hiding this comment

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

Additions in this file are from config_poller.go that config_poller_v2.go uses

Merge remote-tracking branch 'origin/main' into ogt/clean-up-dead-cci…

faf4852

…p-reader-code

ogtownsend marked this pull request as ready for review January 20, 2026 17:42

ogtownsend requested review from a team as code owners January 20, 2026 17:42

ogtownsend requested review from 0xAustinWang, KodeyThomas, asoliman92, chris-de-leon-cll, Copilot, makramkd, mateusz-sekara and winder January 20, 2026 17:42

Copilot AI reviewed Jan 20, 2026

View reviewed changes

ogtownsend changed the title ~~Clean up lots of dead CCIPReader code~~ Clean up lots of dead/deprecated CCIPReader code Jan 20, 2026

winder approved these changes Jan 21, 2026

View reviewed changes

ogtownsend enabled auto-merge January 21, 2026 19:29

makramkd approved these changes Jan 22, 2026

View reviewed changes

ogtownsend added this pull request to the merge queue Jan 22, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 22, 2026

ogtownsend added this pull request to the merge queue Jan 22, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 22, 2026

ogtownsend added this pull request to the merge queue Jan 22, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 22, 2026

ogtownsend added this pull request to the merge queue Jan 23, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 23, 2026

ogtownsend added this pull request to the merge queue Jan 26, 2026

github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jan 26, 2026

Merge remote-tracking branch 'origin/main' into ogt/clean-up-dead-cci…

2a0454f

…p-reader-code

ogtownsend added this pull request to the merge queue Jan 27, 2026

Merged via the queue into main with commit 9e53e86 Jan 27, 2026
57 of 74 checks passed

ogtownsend deleted the ogt/clean-up-dead-ccip-reader-code branch January 27, 2026 05:40

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Clean up lots of dead/deprecated CCIPReader code#1573

Clean up lots of dead/deprecated CCIPReader code#1573
ogtownsend merged 8 commits intomainfrom
ogt/clean-up-dead-ccip-reader-code

ogtownsend commented Jan 16, 2026 •

edited

Loading

Uh oh!

ogtownsend Jan 16, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Jan 20, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

ogtownsend commented Jan 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ogtownsend Jan 16, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Jan 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jan 27, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

ogtownsend commented Jan 16, 2026 •

edited

Loading