fix lint for link token changesets

ChrisAmora · ChrisAmora · commit 882321dfc2bd · 2026-05-04T23:55:37.000-03:00
diff --git a/link/changesets/deploy_link_token.go b/link/changesets/deploy_link_token.go
@@ -13,12 +13,12 @@ import (
 
 	solCommonUtil "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/common"
 	solTokenUtil "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/tokens"
-	"github.com/smartcontractkit/chainlink-common/pkg/logger"
 	cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"
 	cldf_solana "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"
 	"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
 	cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"
 	linkcontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/link"
+	"github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/link_token_interface"
 	"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/link_token"
 
@@ -47,16 +47,17 @@ func DeployLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetOutput,
 	out := newLinkTokenOutput()
 	deployGrp := errgroup.Group{}
 	for _, chain := range chains {
-		chain := chain
 		deployGrp.Go(func() error {
 			deploy, err := deployLinkTokenContractEVM(
-				e.Logger, e.BlockChains.EVMChains()[chain], out.AddressBook,
+				e.Logger, e.BlockChains.EVMChains()[chain], out.AddressBook, //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.
 			)
 			if err != nil {
 				e.Logger.Errorw("Failed to deploy link token", "chain", chain, "err", err)
+
 				return fmt.Errorf("failed to deploy link token for chain %d: %w", chain, err)
 			}
-			return saveAddressRef(out.DataStore, chain, deploy.Address.String(), linkTokenTypeAndVersion(), "", nil)
+
+			return saveAddressRef(out.DataStore, chain, deploy.Address.String(), linkTokenTypeAndVersion(), "")
 		})
 	}
 
@@ -84,12 +85,13 @@ func DeployStaticLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetO
 		if !ok {
 			return cldf.ChangesetOutput{}, fmt.Errorf("chain not found in environment: %d", chainSel)
 		}
-		deploy, err := cldf.DeployContract[*link_token_interface.LinkToken](e.Logger, chain, out.AddressBook,
+		deploy, err := cldf.DeployContract[*link_token_interface.LinkToken](e.Logger, chain, out.AddressBook, //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.
 			func(chain cldf_evm.Chain) cldf.ContractDeploy[*link_token_interface.LinkToken] {
 				linkTokenAddr, tx, linkToken, err2 := link_token_interface.DeployLinkToken(
 					chain.DeployerKey,
 					chain.Client,
 				)
+
 				return cldf.ContractDeploy[*link_token_interface.LinkToken]{
 					Address:  linkTokenAddr,
 					Contract: linkToken,
@@ -102,7 +104,7 @@ func DeployStaticLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetO
 			e.Logger.Errorw("Failed to deploy static link token", "chain", chain.String(), "err", err)
 			return cldf.ChangesetOutput{}, err
 		}
-		if err := saveAddressRef(out.DataStore, chainSel, deploy.Address.String(), staticLinkTokenTypeAndVersion(), "", nil); err != nil {
+		if err := saveAddressRef(out.DataStore, chainSel, deploy.Address.String(), staticLinkTokenTypeAndVersion(), ""); err != nil {
 			return cldf.ChangesetOutput{}, err
 		}
 	}
@@ -136,6 +138,7 @@ func deployLinkTokenContractEVM(
 					chain.Client,
 				)
 			}
+
 			return cldf.ContractDeploy[*link_token.LinkToken]{
 				Address:  linkTokenAddr,
 				Contract: linkToken,
@@ -146,8 +149,10 @@ func deployLinkTokenContractEVM(
 		})
 	if err != nil {
 		lggr.Errorw("Failed to deploy link token", "chain", chain.String(), "err", err)
+
 		return linkToken, err
 	}
+
 	return linkToken, nil
 }
 
@@ -190,11 +195,11 @@ func DeploySolanaLinkToken(e cldf.Environment, cfg DeploySolanaLinkTokenConfig)
 	e.Logger.Infow("Deployed contract", "Contract", tv.String(), "addr", mint.PublicKey().String(), "chain", chain.String())
 
 	out := newLinkTokenOutput()
-	if err := out.AddressBook.Save(chain.Selector, mint.PublicKey().String(), tv); err != nil {
+	if err := out.AddressBook.Save(chain.Selector, mint.PublicKey().String(), tv); err != nil { //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.
 		e.Logger.Errorw("Failed to save link token", "chain", chain.String(), "err", err)
 		return cldf.ChangesetOutput{}, err
 	}
-	if err := saveAddressRef(out.DataStore, chain.Selector, mint.PublicKey().String(), tv, "", nil); err != nil {
+	if err := saveAddressRef(out.DataStore, chain.Selector, mint.PublicKey().String(), tv, ""); err != nil {
 		e.Logger.Errorw("Failed to save link token in datastore", "chain", chain.String(), "err", err)
 		return cldf.ChangesetOutput{}, err
 	}
@@ -217,14 +222,14 @@ func staticLinkTokenTypeAndVersion() cldf.TypeAndVersion {
 	return cldf.NewTypeAndVersion(linkcontracts.StaticLinkToken, cldchangesetscommon.Version1_0_0)
 }
 
-func saveAddressRef(ds datastore.MutableDataStore, chainSelector uint64, address string, tv cldf.TypeAndVersion, qualifier string, labels []string) error {
+func saveAddressRef(ds datastore.MutableDataStore, chainSelector uint64, address string, tv cldf.TypeAndVersion, qualifier string) error {
 	return ds.Addresses().Add(datastore.AddressRef{
 		ChainSelector: chainSelector,
 		Address:       address,
 		Type:          datastore.ContractType(tv.Type.String()),
 		Version:       &tv.Version,
 		Qualifier:     qualifier,
-		Labels:        datastore.NewLabelSet(labels...),
+		Labels:        datastore.NewLabelSet(),
 	})
 }
 
@@ -234,6 +239,7 @@ func validateSelectorsInEnvironment(e cldf.Environment, chains []uint64) error {
 			return fmt.Errorf("chain %d not found in environment", chain)
 		}
 	}
+
 	return nil
 }
 
@@ -245,6 +251,7 @@ func validateNoDuplicateSelectors(chains []uint64) error {
 		}
 		seen[chain] = struct{}{}
 	}
+
 	return nil
 }
 
@@ -258,11 +265,12 @@ func validateSelectorsFamily(chains []uint64, family string) error {
 			return fmt.Errorf("chain selector %d is not in the %s family", chain, family)
 		}
 	}
+
 	return nil
 }
 
 func validateNoExistingContract(e cldf.Environment, chains []uint64, tv cldf.TypeAndVersion) error {
-	if e.ExistingAddresses != nil {
+	if e.ExistingAddresses != nil { //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook state.
 		for _, chain := range chains {
 			addresses, err := e.ExistingAddresses.AddressesForChain(chain) //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook state.
 			if err != nil {
@@ -290,6 +298,7 @@ func validateNoExistingContract(e cldf.Environment, chains []uint64, tv cldf.Typ
 			}
 		}
 	}
+
 	return nil
 }
 
diff --git a/link/changesets/deploy_link_token_test.go b/link/changesets/deploy_link_token_test.go
@@ -39,14 +39,14 @@ func TestDeployLinkToken(t *testing.T) {
 
 	for _, selector := range selectors {
 		chain := rt.Environment().BlockChains.EVMChains()[selector]
-		addrs, err := rt.State().AddressBook.AddressesForChain(selector)
-		require.NoError(t, err)
+		addrs, addrsErr := rt.State().AddressBook.AddressesForChain(selector)
+		require.NoError(t, addrsErr)
 
-		state, err := evmstate.MaybeLoadLinkTokenChainState(chain, addrs)
-		require.NoError(t, err)
+		state, stateErr := evmstate.MaybeLoadLinkTokenChainState(chain, addrs)
+		require.NoError(t, stateErr)
 
-		_, err = state.GenerateLinkView()
-		require.NoError(t, err)
+		_, viewErr := state.GenerateLinkView()
+		require.NoError(t, viewErr)
 	}
 
 	refs, err := rt.State().DataStore.Addresses().Fetch()
@@ -226,14 +226,16 @@ func addressBookWith(t *testing.T, selector uint64, address string, tv cldf.Type
 
 	ab := cldf.NewMemoryAddressBook()
 	require.NoError(t, ab.Save(selector, address, tv))
+
 	return ab
 }
 
 func datastoreWith(t *testing.T, selector uint64, address string, tv cldf.TypeAndVersion, qualifier string) datastore.DataStore {
 	t.Helper()
 
 	ds := datastore.NewMemoryDataStore()
-	require.NoError(t, saveAddressRef(ds, selector, address, tv, qualifier, nil))
+	require.NoError(t, saveAddressRef(ds, selector, address, tv, qualifier))
+
 	return ds.Seal()
 }
 
@@ -247,13 +249,15 @@ func datastoreWithNilVersion(t *testing.T, selector uint64, address string, cont
 		Type:          datastore.ContractType(contractType.String()),
 		Qualifier:     qualifier,
 	}))
+
 	return ds.Seal()
 }
 
 func typeAndVersionWithLabels(tv cldf.TypeAndVersion, labels ...string) cldf.TypeAndVersion {
 	for _, label := range labels {
 		tv.Labels.Add(label)
 	}
+
 	return tv
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ import (`
`13`	`13`
`14`	`14`	`solCommonUtil "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/common"`
`15`	`15`	`solTokenUtil "github.com/smartcontractkit/chainlink-ccip/chains/solana/utils/tokens"`
`16`		`- "github.com/smartcontractkit/chainlink-common/pkg/logger"`
`17`	`16`	`cldf_evm "github.com/smartcontractkit/chainlink-deployments-framework/chain/evm"`
`18`	`17`	`cldf_solana "github.com/smartcontractkit/chainlink-deployments-framework/chain/solana"`
`19`	`18`	`"github.com/smartcontractkit/chainlink-deployments-framework/datastore"`
`20`	`19`	`cldf "github.com/smartcontractkit/chainlink-deployments-framework/deployment"`
`21`	`20`	`linkcontracts "github.com/smartcontractkit/chainlink-deployments-framework/engine/cld/contracts/link"`
	`21`	`+ "github.com/smartcontractkit/chainlink-deployments-framework/pkg/logger"`
`22`	`22`	`"github.com/smartcontractkit/chainlink-evm/gethwrappers/generated/link_token_interface"`
`23`	`23`	`"github.com/smartcontractkit/chainlink-evm/gethwrappers/shared/generated/initial/link_token"`
`24`	`24`
`@@ -47,16 +47,17 @@ func DeployLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetOutput,`
`47`	`47`	`out := newLinkTokenOutput()`
`48`	`48`	`deployGrp := errgroup.Group{}`
`49`	`49`	`for _, chain := range chains {`
`50`		`- chain := chain`
`51`	`50`	`deployGrp.Go(func() error {`
`52`	`51`	`deploy, err := deployLinkTokenContractEVM(`
`53`		`- e.Logger, e.BlockChains.EVMChains()[chain], out.AddressBook,`
	`52`	`+ e.Logger, e.BlockChains.EVMChains()[chain], out.AddressBook, //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.`
`54`	`53`	`)`
`55`	`54`	`if err != nil {`
`56`	`55`	`e.Logger.Errorw("Failed to deploy link token", "chain", chain, "err", err)`
	`56`	`+`
`57`	`57`	`return fmt.Errorf("failed to deploy link token for chain %d: %w", chain, err)`
`58`	`58`	`}`
`59`		`- return saveAddressRef(out.DataStore, chain, deploy.Address.String(), linkTokenTypeAndVersion(), "", nil)`
	`59`	`+`
	`60`	`+ return saveAddressRef(out.DataStore, chain, deploy.Address.String(), linkTokenTypeAndVersion(), "")`
`60`	`61`	`})`
`61`	`62`	`}`
`62`	`63`
`@@ -84,12 +85,13 @@ func DeployStaticLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetO`
`84`	`85`	`if !ok {`
`85`	`86`	`return cldf.ChangesetOutput{}, fmt.Errorf("chain not found in environment: %d", chainSel)`
`86`	`87`	`}`
`87`		`- deploy, err := cldf.DeployContract[*link_token_interface.LinkToken](e.Logger, chain, out.AddressBook,`
	`88`	`+ deploy, err := cldf.DeployContract[*link_token_interface.LinkToken](e.Logger, chain, out.AddressBook, //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.`
`88`	`89`	`func(chain cldf_evm.Chain) cldf.ContractDeploy[*link_token_interface.LinkToken] {`
`89`	`90`	`linkTokenAddr, tx, linkToken, err2 := link_token_interface.DeployLinkToken(`
`90`	`91`	`chain.DeployerKey,`
`91`	`92`	`chain.Client,`
`92`	`93`	`)`
	`94`	`+`
`93`	`95`	`return cldf.ContractDeploy[*link_token_interface.LinkToken]{`
`94`	`96`	`Address: linkTokenAddr,`
`95`	`97`	`Contract: linkToken,`
`@@ -102,7 +104,7 @@ func DeployStaticLinkToken(e cldf.Environment, chains []uint64) (cldf.ChangesetO`
`102`	`104`	`e.Logger.Errorw("Failed to deploy static link token", "chain", chain.String(), "err", err)`
`103`	`105`	`return cldf.ChangesetOutput{}, err`
`104`	`106`	`}`
`105`		`- if err := saveAddressRef(out.DataStore, chainSel, deploy.Address.String(), staticLinkTokenTypeAndVersion(), "", nil); err != nil {`
	`107`	`+ if err := saveAddressRef(out.DataStore, chainSel, deploy.Address.String(), staticLinkTokenTypeAndVersion(), ""); err != nil {`
`106`	`108`	`return cldf.ChangesetOutput{}, err`
`107`	`109`	`}`
`108`	`110`	`}`
`@@ -136,6 +138,7 @@ func deployLinkTokenContractEVM(`
`136`	`138`	`chain.Client,`
`137`	`139`	`)`
`138`	`140`	`}`
	`141`	`+`
`139`	`142`	`return cldf.ContractDeploy[*link_token.LinkToken]{`
`140`	`143`	`Address: linkTokenAddr,`
`141`	`144`	`Contract: linkToken,`
`@@ -146,8 +149,10 @@ func deployLinkTokenContractEVM(`
`146`	`149`	`})`
`147`	`150`	`if err != nil {`
`148`	`151`	`lggr.Errorw("Failed to deploy link token", "chain", chain.String(), "err", err)`
	`152`	`+`
`149`	`153`	`return linkToken, err`
`150`	`154`	`}`
	`155`	`+`
`151`	`156`	`return linkToken, nil`
`152`	`157`	`}`
`153`	`158`
`@@ -190,11 +195,11 @@ func DeploySolanaLinkToken(e cldf.Environment, cfg DeploySolanaLinkTokenConfig)`
`190`	`195`	`e.Logger.Infow("Deployed contract", "Contract", tv.String(), "addr", mint.PublicKey().String(), "chain", chain.String())`
`191`	`196`
`192`	`197`	`out := newLinkTokenOutput()`
`193`		`- if err := out.AddressBook.Save(chain.Selector, mint.PublicKey().String(), tv); err != nil {`
	`198`	`+ if err := out.AddressBook.Save(chain.Selector, mint.PublicKey().String(), tv); err != nil { //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook output.`
`194`	`199`	`e.Logger.Errorw("Failed to save link token", "chain", chain.String(), "err", err)`
`195`	`200`	`return cldf.ChangesetOutput{}, err`
`196`	`201`	`}`
`197`		`- if err := saveAddressRef(out.DataStore, chain.Selector, mint.PublicKey().String(), tv, "", nil); err != nil {`
	`202`	`+ if err := saveAddressRef(out.DataStore, chain.Selector, mint.PublicKey().String(), tv, ""); err != nil {`
`198`	`203`	`e.Logger.Errorw("Failed to save link token in datastore", "chain", chain.String(), "err", err)`
`199`	`204`	`return cldf.ChangesetOutput{}, err`
`200`	`205`	`}`
`@@ -217,14 +222,14 @@ func staticLinkTokenTypeAndVersion() cldf.TypeAndVersion {`
`217`	`222`	`return cldf.NewTypeAndVersion(linkcontracts.StaticLinkToken, cldchangesetscommon.Version1_0_0)`
`218`	`223`	`}`
`219`	`224`
`220`		`-func saveAddressRef(ds datastore.MutableDataStore, chainSelector uint64, address string, tv cldf.TypeAndVersion, qualifier string, labels []string) error {`
	`225`	`+func saveAddressRef(ds datastore.MutableDataStore, chainSelector uint64, address string, tv cldf.TypeAndVersion, qualifier string) error {`
`221`	`226`	`return ds.Addresses().Add(datastore.AddressRef{`
`222`	`227`	`ChainSelector: chainSelector,`
`223`	`228`	`Address: address,`
`224`	`229`	`Type: datastore.ContractType(tv.Type.String()),`
`225`	`230`	`Version: &tv.Version,`
`226`	`231`	`Qualifier: qualifier,`
`227`		`- Labels: datastore.NewLabelSet(labels...),`
	`232`	`+ Labels: datastore.NewLabelSet(),`
`228`	`233`	`})`
`229`	`234`	`}`
`230`	`235`
`@@ -234,6 +239,7 @@ func validateSelectorsInEnvironment(e cldf.Environment, chains []uint64) error {`
`234`	`239`	`return fmt.Errorf("chain %d not found in environment", chain)`
`235`	`240`	`}`
`236`	`241`	`}`
	`242`	`+`
`237`	`243`	`return nil`
`238`	`244`	`}`
`239`	`245`
`@@ -245,6 +251,7 @@ func validateNoDuplicateSelectors(chains []uint64) error {`
`245`	`251`	`}`
`246`	`252`	`seen[chain] = struct{}{}`
`247`	`253`	`}`
	`254`	`+`
`248`	`255`	`return nil`
`249`	`256`	`}`
`250`	`257`
`@@ -258,11 +265,12 @@ func validateSelectorsFamily(chains []uint64, family string) error {`
`258`	`265`	`return fmt.Errorf("chain selector %d is not in the %s family", chain, family)`
`259`	`266`	`}`
`260`	`267`	`}`
	`268`	`+`
`261`	`269`	`return nil`
`262`	`270`	`}`
`263`	`271`
`264`	`272`	`func validateNoExistingContract(e cldf.Environment, chains []uint64, tv cldf.TypeAndVersion) error {`
`265`		`- if e.ExistingAddresses != nil {`
	`273`	`+ if e.ExistingAddresses != nil { //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook state.`
`266`	`274`	`for _, chain := range chains {`
`267`	`275`	`addresses, err := e.ExistingAddresses.AddressesForChain(chain) //nolint:staticcheck // SA1019: legacy changeset still supports AddressBook state.`
`268`	`276`	`if err != nil {`
`@@ -290,6 +298,7 @@ func validateNoExistingContract(e cldf.Environment, chains []uint64, tv cldf.Typ`
`290`	`298`	`}`
`291`	`299`	`}`
`292`	`300`	`}`
	`301`	`+`
`293`	`302`	`return nil`
`294`	`303`	`}`
`295`	`304`