More merge conflicts

smartcontractkit · Nov 20, 2024 · 8e9de17 · 8e9de17
1 parent 74eb6ca
commit 8e9de17
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/deployment/ccip/changeset/active_candidate_test.go b/deployment/ccip/changeset/active_candidate_test.go
@@ -35,7 +35,7 @@ func TestActiveCandidate(t *testing.T) {
 	// Need to keep track of the block number for each chain so that event subscription can be done from that block.
 	startBlocks := make(map[uint64]*uint64)
 	// Send a message from each chain to every other chain.
-	expectedSeqNum := make(map[ccdeploy.SourceDestPair]uint64)
+	expectedSeqNum := make(map[SourceDestPair]uint64)
 	for src := range e.Chains {
 		for dest, destChain := range e.Chains {
 			if src == dest {
@@ -52,7 +52,7 @@ func TestActiveCandidate(t *testing.T) {
 				FeeToken:     common.HexToAddress("0x0"),
 				ExtraArgs:    nil,
 			})
-			expectedSeqNum[ccdeploy.SourceDestPair{
+			expectedSeqNum[SourceDestPair{
 				SourceChainSelector: src,
 				DestChainSelector:   dest,
 			}] = msgSentEvent.SequenceNumber

diff --git a/deployment/ccip/changeset/initial_deploy_test.go b/deployment/ccip/changeset/initial_deploy_test.go
@@ -81,7 +81,7 @@ func TestInitialDeploy(t *testing.T) {
 	// Need to keep track of the block number for each chain so that event subscription can be done from that block.
 	startBlocks := make(map[uint64]*uint64)
 	// Send a message from each chain to every other chain.
-	expectedSeqNum := make(map[ccdeploy.SourceDestPair]uint64)
+	expectedSeqNum := make(map[SourceDestPair]uint64)
 
 	for src := range e.Chains {
 		for dest, destChain := range e.Chains {
@@ -99,7 +99,7 @@ func TestInitialDeploy(t *testing.T) {
 				FeeToken:     common.HexToAddress("0x0"),
 				ExtraArgs:    nil,
 			})
-			expectedSeqNum[ccdeploy.SourceDestPair{
+			expectedSeqNum[SourceDestPair{
 				SourceChainSelector: src,
 				DestChainSelector:   dest,
 			}] = msgSentEvent.SequenceNumber
@@ -113,7 +113,7 @@ func TestInitialDeploy(t *testing.T) {
 	ConfirmTokenPriceUpdatedForAll(t, e, state, startBlocks,
 		DefaultInitialPrices.LinkPrice, DefaultInitialPrices.WethPrice)
 	// TODO: Fix gas prices?
-	//ccdeploy.ConfirmGasPriceUpdatedForAll(t, e, state, startBlocks)
+	//ConfirmGasPriceUpdatedForAll(t, e, state, startBlocks)
 	//
 	//// Wait for all exec reports to land
 	ConfirmExecWithSeqNrForAll(t, e, state, expectedSeqNum, startBlocks)