fix lint

smartcontractkit · Dec 18, 2024 · 347a775 · 347a775
1 parent 4032b96
commit 347a775
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/deployment/ccip/changeset/cs_prerequisites.go b/deployment/ccip/changeset/cs_prerequisites.go
@@ -188,7 +188,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 						chain.Client,
 					)
 					return deployment.ContractDeploy[*mock_rmn_contract.MockRMNContract]{
-						rmnAddress, rmnC, tx2, deployment.NewTypeAndVersion(MockRMN, deployment.Version1_0_0), err2,
+						Address: rmnAddress, Contract: rmnC, Tx: tx2, Tv: deployment.NewTypeAndVersion(MockRMN, deployment.Version1_0_0), Err: err2,
 					}
 				})
 			if err != nil {
@@ -210,7 +210,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					rmnAddr,
 				)
 				return deployment.ContractDeploy[*rmn_proxy_contract.RMNProxyContract]{
-					rmnProxyAddr, rmnProxy, tx2, deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_0_0), err2,
+					Address: rmnProxyAddr, Contract: rmnProxy, Tx: tx2, Tv: deployment.NewTypeAndVersion(ARMProxy, deployment.Version1_0_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -259,7 +259,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					chain.DeployerKey,
 					chain.Client)
 				return deployment.ContractDeploy[*token_admin_registry.TokenAdminRegistry]{
-					tokenAdminRegistryAddr, tokenAdminRegistry, tx2, deployment.NewTypeAndVersion(TokenAdminRegistry, deployment.Version1_5_0), err2,
+					Address: tokenAdminRegistryAddr, Contract: tokenAdminRegistry, Tx: tx2, Tv: deployment.NewTypeAndVersion(TokenAdminRegistry, deployment.Version1_5_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -278,7 +278,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					chain.Client,
 					tokenAdminReg.Address())
 				return deployment.ContractDeploy[*registry_module_owner_custom.RegistryModuleOwnerCustom]{
-					regModAddr, regMod, tx2, deployment.NewTypeAndVersion(RegistryModule, deployment.Version1_5_0), err2,
+					Address: regModAddr, Contract: regMod, Tx: tx2, Tv: deployment.NewTypeAndVersion(RegistryModule, deployment.Version1_5_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -316,7 +316,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					chain.Client,
 				)
 				return deployment.ContractDeploy[*weth9.WETH9]{
-					weth9Addr, weth9c, tx2, deployment.NewTypeAndVersion(WETH9, deployment.Version1_0_0), err2,
+					Address: weth9Addr, Contract: weth9c, Tx: tx2, Tv: deployment.NewTypeAndVersion(WETH9, deployment.Version1_0_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -340,7 +340,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					rmnProxy.Address(),
 				)
 				return deployment.ContractDeploy[*router.Router]{
-					routerAddr, routerC, tx2, deployment.NewTypeAndVersion(Router, deployment.Version1_2_0), err2,
+					Address: routerAddr, Contract: routerC, Tx: tx2, Tv: deployment.NewTypeAndVersion(Router, deployment.Version1_2_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -360,7 +360,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					chain.Client,
 				)
 				return deployment.ContractDeploy[*multicall3.Multicall3]{
-					multicall3Addr, multicall3Wrapper, tx2, deployment.NewTypeAndVersion(Multicall3, deployment.Version1_0_0), err2,
+					Address: multicall3Addr, Contract: multicall3Wrapper, Tx: tx2, Tv: deployment.NewTypeAndVersion(Multicall3, deployment.Version1_0_0), Err: err2,
 				}
 			})
 		if err != nil {
@@ -394,7 +394,7 @@ func deployPrerequisiteContracts(e deployment.Environment, ab deployment.Address
 					false,
 				)
 				return deployment.ContractDeploy[*maybe_revert_message_receiver.MaybeRevertMessageReceiver]{
-					receiverAddr, receiver, tx, deployment.NewTypeAndVersion(CCIPReceiver, deployment.Version1_0_0), err2,
+					Address: receiverAddr, Contract: receiver, Tx: tx, Tv: deployment.NewTypeAndVersion(CCIPReceiver, deployment.Version1_0_0), Err: err2,
 				}
 			})
 		if err != nil {

diff --git a/deployment/ccip/changeset/v1_5/cs_lane_contracts.go b/deployment/ccip/changeset/v1_5/cs_lane_contracts.go
@@ -130,7 +130,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 	if !onRampExists {
 		onRampC, err := deployment.DeployContract(e.Logger, sourceChain, ab,
 			func(chain deployment.Chain) deployment.ContractDeploy[*evm_2_evm_onramp.EVM2EVMOnRamp] {
-				onRampAddress, tx, onRampC, err2 := evm_2_evm_onramp.DeployEVM2EVMOnRamp(
+				onRampAddress, tx2, onRampC, err2 := evm_2_evm_onramp.DeployEVM2EVMOnRamp(
 					sourceChain.DeployerKey,
 					sourceChain.Client,
 					cfg.OnRampStaticCfg,
@@ -141,7 +141,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 					cfg.OnRampNopsAndWeight,
 				)
 				return deployment.ContractDeploy[*evm_2_evm_onramp.EVM2EVMOnRamp]{
-					Address: onRampAddress, Contract: onRampC, Tx: tx,
+					Address: onRampAddress, Contract: onRampC, Tx: tx2,
 					Tv: deployment.NewTypeAndVersion(changeset.OnRamp, deployment.Version1_5_0), Err: err2,
 				}
 			})
@@ -161,7 +161,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 	if !commitStoreExists {
 		commitStoreC, err := deployment.DeployContract(e.Logger, destChain, ab,
 			func(chain deployment.Chain) deployment.ContractDeploy[*commit_store.CommitStore] {
-				commitStoreAddress, tx, commitStoreC, err2 := commit_store.DeployCommitStore(
+				commitStoreAddress, tx2, commitStoreC, err2 := commit_store.DeployCommitStore(
 					destChain.DeployerKey,
 					destChain.Client,
 					commit_store.CommitStoreStaticConfig{
@@ -172,7 +172,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 					},
 				)
 				return deployment.ContractDeploy[*commit_store.CommitStore]{
-					Address: commitStoreAddress, Contract: commitStoreC, Tx: tx,
+					Address: commitStoreAddress, Contract: commitStoreC, Tx: tx2,
 					Tv: deployment.NewTypeAndVersion(changeset.CommitStore, deployment.Version1_5_0), Err: err2,
 				}
 			})
@@ -192,7 +192,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 	if !offRampExists {
 		offRampC, err := deployment.DeployContract(e.Logger, destChain, ab,
 			func(chain deployment.Chain) deployment.ContractDeploy[*evm_2_evm_offramp.EVM2EVMOffRamp] {
-				offRampAddress, tx, offRampC, err2 := evm_2_evm_offramp.DeployEVM2EVMOffRamp(
+				offRampAddress, tx2, offRampC, err2 := evm_2_evm_offramp.DeployEVM2EVMOffRamp(
 					destChain.DeployerKey,
 					destChain.Client,
 					evm_2_evm_offramp.EVM2EVMOffRampStaticConfig{
@@ -207,7 +207,7 @@ func deployLane(e deployment.Environment, state changeset.CCIPOnChainState, ab d
 					cfg.OffRampRateLimiterCfg,
 				)
 				return deployment.ContractDeploy[*evm_2_evm_offramp.EVM2EVMOffRamp]{
-					Address: offRampAddress, Contract: offRampC, Tx: tx,
+					Address: offRampAddress, Contract: offRampC, Tx: tx2,
 					Tv: deployment.NewTypeAndVersion(changeset.OffRamp, deployment.Version1_5_0), Err: err2,
 				}
 			})

diff --git a/deployment/ccip/changeset/v1_5/cs_ocr2_config.go b/deployment/ccip/changeset/v1_5/cs_ocr2_config.go
@@ -296,6 +296,9 @@ func deriveOCR2Config(
 		int(nodes.DefaultF()),
 		ocrParams.OnchainConfig,
 	)
+	if err != nil {
+		return FinalOCR2Config{}, fmt.Errorf("failed to derive OCR2 config: %w", err)
+	}
 	var signersAddresses []common.Address
 	for _, signer := range signers {
 		if len(signer) != 20 {

diff --git a/deployment/ccip/changeset/v1_5/test_helpers.go b/deployment/ccip/changeset/v1_5/test_helpers.go
@@ -176,10 +176,8 @@ func NewEnvironment(t *testing.T, tc *changeset.TestConfigs, tEnv changeset.Test
 }
 
 func AddLanes(t *testing.T, e deployment.Environment, state changeset.CCIPOnChainState, pairs []changeset.SourceDestPair) deployment.Environment {
-	state, err := changeset.LoadOnchainState(e)
-	require.NoError(t, err)
-
 	addLanesCfg, commitOCR2Configs, execOCR2Configs, jobspecs := LaneConfigsForChains(t, e, state, pairs)
+	var err error
 	e, err = commonchangeset.ApplyChangesets(t, e, nil, []commonchangeset.ChangesetApplication{
 		{
 			Changeset: commonchangeset.WrapChangeSet(DeployLanes),

diff --git a/deployment/environment/memory/environment.go b/deployment/environment/memory/environment.go
@@ -87,7 +87,7 @@ func generateMemoryChain(t *testing.T, inputs map[uint64]EVMChain) map[uint64]de
 						return bind.WaitMined(ctx, backend, tx)
 					}()
 					if err != nil {
-						return 0, fmt.Errorf("tx %s failed to confirm: %v, chain %d", tx.Hash().Hex(), err, chainInfo.ChainSelector)
+						return 0, fmt.Errorf("tx %s failed to confirm: %w, chain %d", tx.Hash().Hex(), err, chainInfo.ChainSelector)
 					}
 					if receipt.Status == 0 {
 						errReason, err := deployment.GetErrorReasonFromTx(chain.Backend.Client(), chain.DeployerKey.From, tx, receipt)