refactor

smartcontractkit · Jan 21, 2025 · 36a5ad1 · 36a5ad1
1 parent e8bbe9a
commit 36a5ad1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/core/capabilities/ccip/extraargscodec.go → ...apabilities/ccip/common/extraargscodec.go b/core/capabilities/ccip/extraargscodec.go → ...apabilities/ccip/common/extraargscodec.go
@@ -1,4 +1,4 @@
-package ccip
+package common
 
 import (
 	"fmt"

diff --git a/core/capabilities/ccip/oraclecreator/plugin.go b/core/capabilities/ccip/oraclecreator/plugin.go
@@ -13,7 +13,7 @@ import (
 	"github.com/gagliardetto/solana-go"
 	"github.com/google/uuid"
 	"github.com/prometheus/client_golang/prometheus"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip"
+	common2 "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 	"github.com/smartcontractkit/chainlink/v2/core/services/relay"
 
 	chainsel "github.com/smartcontractkit/chain-selectors"
@@ -287,7 +287,7 @@ func (i *pluginOracleCreator) createFactoryAndTransmitter(
 			ccipreaderpkg.OCR3ConfigWithMeta(config),
 			ccipevm.NewCommitPluginCodecV1(),
 			ccipevm.NewMessageHasherV1(i.lggr.Named("MessageHasherV1")),
-			ccip.NewExtraArgsCodec(),
+			common2.NewExtraArgsCodec(),
 			i.homeChainReader,
 			i.homeChainSelector,
 			contractReaders,
@@ -310,7 +310,7 @@ func (i *pluginOracleCreator) createFactoryAndTransmitter(
 			ccipreaderpkg.OCR3ConfigWithMeta(config),
 			ccipevm.NewExecutePluginCodecV1(),
 			ccipevm.NewMessageHasherV1(i.lggr.Named("MessageHasherV1")),
-			ccip.NewExtraArgsCodec(),
+			common2.NewExtraArgsCodec(),
 			i.homeChainReader,
 			ccipevm.NewEVMTokenDataEncoder(),
 			ccipevm.NewGasEstimateProvider(),

diff --git a/integration-tests/smoke/ccip/ccip_reader_test.go b/integration-tests/smoke/ccip/ccip_reader_test.go
@@ -14,7 +14,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethclient/simulated"
 	"github.com/jmoiron/sqlx"
-	"github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip"
+	common2 "github.com/smartcontractkit/chainlink/v2/core/capabilities/ccip/common"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/zap/zapcore"
@@ -291,7 +291,7 @@ func TestCCIPReader_GetOffRampConfigDigest(t *testing.T) {
 		nil,
 		chainD,
 		addr.Bytes(),
-		ccip.NewExtraArgsCodec(),
+		common2.NewExtraArgsCodec(),
 	)
 
 	ccipReaderCommitDigest, err := reader.GetOffRampConfigDigest(ctx, consts.PluginTypeCommit)
@@ -1411,7 +1411,7 @@ func testSetupRealContracts(
 		contractReaders[chain] = cr
 	}
 	contractWriters := make(map[cciptypes.ChainSelector]types.ContractWriter)
-	edc := ccip.NewExtraArgsCodec()
+	edc := common2.NewExtraArgsCodec()
 	reader := ccipreaderpkg.NewCCIPReaderWithExtendedContractReaders(ctx, lggr, contractReaders, contractWriters, cciptypes.ChainSelector(destChain), nil, edc)
 
 	return reader
@@ -1527,7 +1527,7 @@ func testSetup(
 		contractReaders[chain] = cr
 	}
 	contractWriters := make(map[cciptypes.ChainSelector]types.ContractWriter)
-	edc := ccip.NewExtraArgsCodec()
+	edc := common2.NewExtraArgsCodec()
 	reader := ccipreaderpkg.NewCCIPReaderWithExtendedContractReaders(ctx, lggr, contractReaders, contractWriters, params.DestChain, nil, edc)
 
 	t.Cleanup(func() {