fix: merge conflicts

Author: ecPablo

legacy/mcms/internal/family/evm/changesets/deploy_mcms_with_timelock.go

@@ -14,7 +14,6 @@ import (
 	seqevm "github.com/smartcontractkit/cld-changesets/legacy/mcms/internal/family/evm/sequences"
 	evmops "github.com/smartcontractkit/cld-changesets/legacy/mcms/oputils"
 	evmstate "github.com/smartcontractkit/cld-changesets/legacy/pkg/family/evm"
-	evmops "github.com/smartcontractkit/cld-changesets/mcms/evm/operations"
 )
 
 // DeployMCMSOption is a function that modifies a TypeAndVersion before or after deployment.

legacy/mcms/oputils/oputils.go

@@ -1,8 +1,4 @@
-<<<<<<<< HEAD:mcms/evm/operations/oputils.go
-package operations
-========
 package oputils
->>>>>>>> main:legacy/mcms/oputils/oputils.go
 
 import (
 	"context"
@@ -368,35 +364,6 @@ func CloneTransactOptsWithGas(opts *bind.TransactOpts, gasLimit uint64, gasPrice
 	return &newOpts
 }
 
-// EVMCallOutputsToBatch converts unconfirmed EVM call outputs into a single batch operation.
-func EVMCallOutputsToBatch(chainSelector uint64, outs []EVMCallOutput) (mcmstypes.BatchOperation, error) {
-	result := mcmstypes.BatchOperation{
-		ChainSelector: mcmstypes.ChainSelector(chainSelector),
-		Transactions:  []mcmstypes.Transaction{},
-	}
-
-	for _, out := range outs {
-		if out.Confirmed {
-			continue
-		}
-
-		batchOperation, err := cldfproposalutils.BatchOperationForChain(
-			chainSelector,
-			out.To.Hex(),
-			out.Data,
-			big.NewInt(0),
-			string(out.ContractType),
-			[]string{},
-		)
-		if err != nil {
-			return mcmstypes.BatchOperation{}, fmt.Errorf("failed to create batch operation for chain %d: %w", chainSelector, err)
-		}
-		result.Transactions = append(result.Transactions, batchOperation.Transactions...)
-	}
-
-	return result, nil
-}
-
 // GasBoostConfigsForChainMap creates a map of GasBoostConfig pointers for each chain in the provided chainMap.
 // If a chain selector exists in gasBoostConfigs, it uses that config; otherwise, it sets nil.
 func GasBoostConfigsForChainMap[T any](chainMap map[uint64]T, gasBoostConfigs map[uint64]cldfproposalutils.GasBoostConfig) map[uint64]*cldfproposalutils.GasBoostConfig {