Fix import paths (#1316)

## Motivation ## Solution
smartcontractkit · Aug 19, 2024 · f1f63fd · f1f63fd
1 parent cc8d128
commit f1f63fd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/integration-tests/deployment/ccip/deploy.go b/integration-tests/deployment/ccip/deploy.go
@@ -8,13 +8,13 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	owner_helpers "github.com/smartcontractkit/ccip-owner-contracts/gethwrappers"
-	deployment2 "github.com/smartcontractkit/ccip/integration-tests/deployment"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
 
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/ccip_config"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/maybe_revert_message_receiver"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
-	"github.com/smartcontractkit/chainlink/integration-tests/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/arm_proxy_contract"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_multi_offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/evm_2_evm_multi_onramp"
@@ -118,7 +118,7 @@ type DeployCCIPContractConfig struct {
 // Deployment produces an address book of everything it deployed.
 func DeployCCIPContracts(e deployment.Environment, c DeployCCIPContractConfig) (deployment.AddressBook, error) {
 	ab := deployment.NewMemoryAddressBook()
-	nodes, err := deployment2.NodeInfo(e.NodeIDs, e.Offchain)
+	nodes, err := deployment.NodeInfo(e.NodeIDs, e.Offchain)
 	if err != nil {
 		e.Logger.Errorw("Failed to get node info", "err", err)
 		return ab, err
@@ -481,11 +481,11 @@ func AddLane(e deployment.Environment, state CCIPOnChainState, from, to uint64)
 			TokenPriceUpdates: []price_registry.InternalTokenPriceUpdate{
 				{
 					SourceToken: state.LinkTokens[from].Address(),
-					UsdPerToken: deployment2.E18Mult(20),
+					UsdPerToken: deployment.E18Mult(20),
 				},
 				{
 					SourceToken: state.Weth9s[from].Address(),
-					UsdPerToken: deployment2.E18Mult(4000),
+					UsdPerToken: deployment.E18Mult(4000),
 				},
 			},
 			GasPriceUpdates: []price_registry.InternalGasPriceUpdate{

diff --git a/integration-tests/deployment/ccip/deploy_home_chain.go b/integration-tests/deployment/ccip/deploy_home_chain.go
@@ -12,8 +12,6 @@ import (
 	confighelper2 "github.com/smartcontractkit/libocr/offchainreporting2plus/confighelper"
 	"github.com/smartcontractkit/libocr/offchainreporting2plus/ocr3confighelper"
 
-	deployment2 "github.com/smartcontractkit/ccip/integration-tests/deployment"
-
 	"github.com/smartcontractkit/chainlink-ccip/chainconfig"
 	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
 	commonconfig "github.com/smartcontractkit/chainlink-common/pkg/config"
@@ -204,7 +202,7 @@ func AddDON(
 	f uint8,
 	bootstrapP2PID [32]byte,
 	p2pIDs [][32]byte,
-	nodes []deployment2.Node,
+	nodes []deployment.Node,
 ) error {
 	sortP2PIDS(p2pIDs)
 	// Get OCR3 Config from helper