Skip to content

core/services/ocr2/plugins/ocr2keeper/evmregistry/upkeepstate: fix test race; bump common to expose more races #22085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jmank88 merged 1 commit into from
Apr 20, 2026
+28 −22
Merged

core/services/ocr2/plugins/ocr2keeper/evmregistry/upkeepstate: fix test race; bump common to expose more races #22085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/scripts/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.98
github.com/smartcontractkit/chainlink-automation v0.8.1
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-data-streams v0.1.13
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
Expand Down
4 changes: 2 additions & 2 deletions core/scripts/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 7 additions & 1 deletion core/services/ocr2/plugins/ocr2keeper/evmregistry/v21/upkeepstate/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ func TestUpkeepStateStore_SetSelectIntegration(t *testing.T) {
}

// empty the cache before doing selects to force a db lookup
store.cache = make(map[string]*upkeepStateRecord)
store.clearCache()

states, err := store.SelectByWorkIDs(ctx, test.queryIDs...)

Expand All @@ -379,6 +379,12 @@ func TestUpkeepStateStore_SetSelectIntegration(t *testing.T) {
}
}

func (u *upkeepStateStore) clearCache() {
u.mu.Lock()
defer u.mu.Unlock()
u.cache = make(map[string]*upkeepStateRecord)
}

func TestUpkeepStateStore_emptyDB(t *testing.T) {
t.Run("querying non-stored workIDs on empty db returns unknown state results", func(t *testing.T) {
lggr, observedLogs := logger.TestLoggerObserved(t, zapcore.ErrorLevel)
Expand Down
2 changes: 1 addition & 1 deletion deployment/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
Expand Down
4 changes: 2 additions & 2 deletions deployment/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccv v0.0.0-20260408181529-b5080e662563
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10
github.com/smartcontractkit/chainlink-data-streams v0.1.13
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion integration-tests/load/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.16
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/load/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system-tests/lib/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/smartcontractkit/chain-selectors v1.0.98
github.com/smartcontractkit/chainlink-aptos v0.0.0-20260407161350-a86b1969da65
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260416173445-80f6efde0a03
Expand Down
4 changes: 2 additions & 2 deletions system-tests/lib/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion system-tests/tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ require (
github.com/rs/zerolog v1.34.0
github.com/shopspring/decimal v1.4.0
github.com/smartcontractkit/chain-selectors v1.0.98
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260417145954-cd522c53ee6e
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260420165928-c51b9c4d2148
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-data-streams v0.1.13
github.com/smartcontractkit/chainlink-deployments-framework v0.95.0
Expand Down
4 changes: 2 additions & 2 deletions system-tests/tests/go.sum
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading