price registry not required for existing deployment

smartcontractkit · Jul 8, 2024 · e3c65d5 · e3c65d5
1 parent 5db8286
commit e3c65d5
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/integration-tests/ccip-tests/actions/ccip_helpers.go b/integration-tests/ccip-tests/actions/ccip_helpers.go
@@ -1000,24 +1000,26 @@ func (ccipModule *CCIPCommon) DeployContracts(
 	}
 
 	// no need to have price registry for existing deployment, we consider that it's already deployed
-	if ccipModule.PriceRegistry == nil && !ccipModule.ExistingDeployment {
-		// we will update the price updates later based on source and dest PriceUpdates
-		ccipModule.PriceRegistry, err = cd.DeployPriceRegistry(
-			[]common.Address{
-				common.HexToAddress(ccipModule.FeeToken.Address()),
-				common.HexToAddress(ccipModule.WrappedNative.Hex()),
-			})
-		if err != nil {
-			return fmt.Errorf("deploying PriceRegistry shouldn't fail %w", err)
-		}
-		err = ccipModule.ChainClient.WaitForEvents()
-		if err != nil {
-			return fmt.Errorf("error in waiting for PriceRegistry deployment %w", err)
-		}
-	} else {
-		ccipModule.PriceRegistry, err = cd.NewPriceRegistry(ccipModule.PriceRegistry.EthAddress)
-		if err != nil {
-			return fmt.Errorf("getting new PriceRegistry contract shouldn't fail %w", err)
+	if !ccipModule.ExistingDeployment {
+		if ccipModule.PriceRegistry == nil {
+			// we will update the price updates later based on source and dest PriceUpdates
+			ccipModule.PriceRegistry, err = cd.DeployPriceRegistry(
+				[]common.Address{
+					common.HexToAddress(ccipModule.FeeToken.Address()),
+					common.HexToAddress(ccipModule.WrappedNative.Hex()),
+				})
+			if err != nil {
+				return fmt.Errorf("deploying PriceRegistry shouldn't fail %w", err)
+			}
+			err = ccipModule.ChainClient.WaitForEvents()
+			if err != nil {
+				return fmt.Errorf("error in waiting for PriceRegistry deployment %w", err)
+			}
+		} else {
+			ccipModule.PriceRegistry, err = cd.NewPriceRegistry(ccipModule.PriceRegistry.EthAddress)
+			if err != nil {
+				return fmt.Errorf("getting new PriceRegistry contract shouldn't fail %w", err)
+			}
 		}
 	}
 	if ccipModule.MulticallContract == (common.Address{}) && ccipModule.MulticallEnabled {