Skip to content

Commit 48c5c22

Browse files
committed
fix: linting and unit tests
1 parent 42ad08a commit 48c5c22

6 files changed

Lines changed: 11 additions & 9 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ require (
1414
github.com/google/go-cmp v0.7.0
1515
github.com/mr-tron/base58 v1.2.0
1616
github.com/samber/lo v1.53.0
17+
github.com/segmentio/ksuid v1.0.4
1718
github.com/smartcontractkit/ccip-owner-contracts v0.1.0
1819
github.com/smartcontractkit/chain-selectors v1.0.102
1920
github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260415165642-49f23e4d76cc
@@ -230,7 +231,6 @@ require (
230231
github.com/sagikazarmark/locafero v0.11.0 // indirect
231232
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
232233
github.com/scylladb/go-reflectx v1.0.1 // indirect
233-
github.com/segmentio/ksuid v1.0.4 // indirect
234234
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
235235
github.com/shirou/gopsutil/v4 v4.26.3 // indirect
236236
github.com/shopspring/decimal v1.4.0 // indirect

mcms/changesets/set-config/changeset_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ import (
3636
setconfigtypes "github.com/smartcontractkit/cld-changesets/mcms/changesets/set-config/types"
3737
)
3838

39+
//nolint:paralleltest // global mcm.SetProgramID state and shared Solana CTF container setup
3940
func TestChangeset_VerifyPreconditions(t *testing.T) {
40-
t.Parallel()
41-
4241
evmSelector := chain_selectors.TEST_90000001.Selector
4342
solSelector := chain_selectors.TEST_22222222222222222222222222222222222222222222.Selector
4443

@@ -51,6 +50,7 @@ func TestChangeset_VerifyPreconditions(t *testing.T) {
5150
environment.WithLogger(logger.Test(t)),
5251
))
5352
require.NoError(t, err)
53+
require.Contains(t, rt.Environment().BlockChains.SolanaChains(), solSelector)
5454

5555
config := cldftesthelpers.SingleGroupTimelockConfig(t)
5656
err = rt.Exec(
@@ -416,7 +416,7 @@ func TestChangeset_EVM_Qualifier(t *testing.T) {
416416
name: "missing qualifier",
417417
qualifier: "",
418418
wantErr: fmt.Sprintf(
419-
"validate timelock ref for chain %s: multiple address refs matched query: expected exactly 1 ref matching query {ChainSelector: %s, Type: %s}, found 2",
419+
"family evm: validate timelock ref for chain %s: multiple address refs matched query: expected exactly 1 ref matching query {ChainSelector: %s, Type: %s}, found 2",
420420
selectorStr,
421421
selectorStr,
422422
mcmscontracts.RBACTimelock,
@@ -426,7 +426,7 @@ func TestChangeset_EVM_Qualifier(t *testing.T) {
426426
name: "unknown qualifier",
427427
qualifier: "does-not-exist",
428428
wantErr: fmt.Sprintf(
429-
"validate timelock ref for chain %s: no address ref matched query: expected exactly 1 ref matching query {ChainSelector: %s, Type: %s, Qualifier: does-not-exist}, found 0",
429+
"family evm: validate timelock ref for chain %s: no address ref matched query: expected exactly 1 ref matching query {ChainSelector: %s, Type: %s, Qualifier: does-not-exist}, found 0",
430430
selectorStr,
431431
selectorStr,
432432
mcmscontracts.RBACTimelock,
@@ -476,9 +476,8 @@ func TestChangeset_EVM_BuildsProposalWithoutExecute(t *testing.T) {
476476
require.NotEmpty(t, output.Reports)
477477
}
478478

479+
//nolint:paralleltest // global mcm.SetProgramID state and shared Solana CTF container setup
479480
func TestChangeset_Solana(t *testing.T) {
480-
t.Parallel()
481-
482481
selector := chain_selectors.TEST_22222222222222222222222222222222222222222222.Selector
483482
programsPath, programIDs, ab := soltestutils.PreloadMCMS(t, selector)
484483

@@ -488,6 +487,7 @@ func TestChangeset_Solana(t *testing.T) {
488487
environment.WithLogger(logger.Test(t)),
489488
))
490489
require.NoError(t, err)
490+
require.Contains(t, rt.Environment().BlockChains.SolanaChains(), selector)
491491

492492
chain := rt.Environment().BlockChains.SolanaChains()[selector]
493493

mcms/solana/set-config/operation_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
mcmstypes "github.com/smartcontractkit/mcms/types"
1818
)
1919

20+
//nolint:paralleltest // global mcm.SetProgramID state
2021
func TestOpSolanaSetConfigMCM(t *testing.T) {
2122
tests := []struct {
2223
name string

mcms/solana/set-config/register.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func Registration() setconfigregistry.Registration {
2828
func verifySolanaChains(env cldf.Environment, chains []setconfigtypes.ChainInput) error {
2929
for _, in := range chains {
3030
if _, ok := env.BlockChains.SolanaChains()[in.ChainSelector]; !ok {
31-
return fmt.Errorf("Solana chain %d not found in environment", in.ChainSelector)
31+
return fmt.Errorf("solana chain %d not found in environment", in.ChainSelector)
3232
}
3333
if err := validateMCMSIfPresent(env, in); err != nil {
3434
return err

mcms/solana/set-config/sequence.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func runSolanaSetConfig(
7373
) (sequenceutils.OnChainOutput, error) {
7474
chain, ok := deps.BlockChains.SolanaChains()[in.ChainSelector]
7575
if !ok {
76-
return sequenceutils.OnChainOutput{}, fmt.Errorf("Solana chain %d not found in environment", in.ChainSelector)
76+
return sequenceutils.OnChainOutput{}, fmt.Errorf("solana chain %d not found in environment", in.ChainSelector)
7777
}
7878

7979
env := setconfigtypes.EnvFromDeps(deps)

mcms/solana/set-config/sequence_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
solreaders "github.com/smartcontractkit/cld-changesets/mcms/solana/readers"
3333
)
3434

35+
//nolint:paralleltest // global mcm.SetProgramID state
3536
func TestSeqSolanaSetConfig(t *testing.T) {
3637
tests := []struct {
3738
name string

0 commit comments

Comments
 (0)