changing default OCR params in test (#694)

## Motivation ## Solution
smartcontractkit · Apr 8, 2024 · 13b01d8 · 13b01d8
1 parent 7a1f798
commit 13b01d8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 30 deletions.
diff --git a/integration-tests/ccip-tests/contracts/contract_deployer.go b/integration-tests/ccip-tests/contracts/contract_deployer.go
@@ -729,8 +729,9 @@ func (e *CCIPContractsDeployer) NewMockAggregator(addr common.Address) (*MockAgg
 var OCR2ParamsForCommit = contracts.OffChainAggregatorV2Config{
 	DeltaProgress:                           config.MustNewDuration(2 * time.Minute),
 	DeltaResend:                             config.MustNewDuration(5 * time.Second),
-	DeltaRound:                              config.MustNewDuration(75 * time.Second),
+	DeltaRound:                              config.MustNewDuration(60 * time.Second),
 	DeltaGrace:                              config.MustNewDuration(5 * time.Second),
+	DeltaStage:                              config.MustNewDuration(25 * time.Second),
 	MaxDurationQuery:                        config.MustNewDuration(100 * time.Millisecond),
 	MaxDurationObservation:                  config.MustNewDuration(35 * time.Second),
 	MaxDurationReport:                       config.MustNewDuration(10 * time.Second),
@@ -741,8 +742,9 @@ var OCR2ParamsForCommit = contracts.OffChainAggregatorV2Config{
 var OCR2ParamsForExec = contracts.OffChainAggregatorV2Config{
 	DeltaProgress:                           config.MustNewDuration(100 * time.Second),
 	DeltaResend:                             config.MustNewDuration(5 * time.Second),
-	DeltaRound:                              config.MustNewDuration(40 * time.Second),
+	DeltaRound:                              config.MustNewDuration(30 * time.Second),
 	DeltaGrace:                              config.MustNewDuration(5 * time.Second),
+	DeltaStage:                              config.MustNewDuration(10 * time.Second),
 	MaxDurationQuery:                        config.MustNewDuration(100 * time.Millisecond),
 	MaxDurationObservation:                  config.MustNewDuration(20 * time.Second),
 	MaxDurationReport:                       config.MustNewDuration(8 * time.Second),

diff --git a/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml b/integration-tests/ccip-tests/testconfig/tomls/ccip-default.toml
@@ -252,32 +252,6 @@ TimeoutForPriceUpdate = '15m'          # Duration to wait for the price update t
 # Could be removed once the pipeline is completely removed.
 WithPipeline = false
 
-# OCR Params
-CommitInflightExpiry = '2m'
-ExecInflightExpiry = '2m'
-
-[CCIP.Groups.smoke.CommitOCRParams]
-DeltaProgress = '2m'
-DeltaResend = '5s'
-DeltaRound = '75s'
-DeltaGrace = '5s'
-MaxDurationQuery = '100ms'
-MaxDurationObservation = '35s'
-MaxDurationReport = '10s'
-MaxDurationShouldAcceptFinalizedReport = '5s'
-MaxDurationShouldTransmitAcceptedReport = '10s'
-
-[CCIP.Groups.smoke.ExecOCRParams]
-DeltaProgress = '100s'
-DeltaResend = '5s'
-DeltaRound = '40s'
-DeltaGrace = '5s'
-MaxDurationQuery = '100ms'
-MaxDurationObservation = '20s'
-MaxDurationReport = '8s'
-MaxDurationShouldAcceptFinalizedReport = '5s'
-MaxDurationShouldTransmitAcceptedReport = '8s'
-
 # uncomment the following if you want to run your tests with specific number of lanes;
 # in this case out of all the possible lane combinations, only the ones with the specified number of lanes will be considered
 # for example, if you have provided CCIP.Env.Networks = ['SIMULATED_1', 'SIMULATED_2', 'SIMULATED_3'] and CCIP.Groups.<test_type>.MaxNoOfLanes = 2,
@@ -326,6 +300,36 @@ TimeoutForPriceUpdate = '15m' # time to wait for price update
 # then only random combinations of 2 lanes from the following will be considered for the test :
 # ['SIMULATED_1', 'SIMULATED_2'], ['SIMULATED_1', 'SIMULATED_3'], ['SIMULATED_2', 'SIMULATED_3']
 #MaxNoOfLanes = <no_of_lanes> # maximum number of lanes to be added in the test; mainly used for scalability tests
+#
+
+# Uncomment the following if you want to run your tests with updated OCR params
+# otherwise test will use default OCR params from -
+# https://github.com/smartcontractkit/ccip/blob/ccip-develop/integration-tests/ccip-tests/contracts/contract_deployer.go#L729-L751
+## OCR Params
+#CommitInflightExpiry = '2m'
+#ExecInflightExpiry = '2m'
+#
+#[CCIP.Groups.load.CommitOCRParams]
+#DeltaProgress = '2m'
+#DeltaResend = '5s'
+#DeltaRound = '75s'
+#DeltaGrace = '5s'
+#MaxDurationQuery = '100ms'
+#MaxDurationObservation = '35s'
+#MaxDurationReport = '10s'
+#MaxDurationShouldAcceptFinalizedReport = '5s'
+#MaxDurationShouldTransmitAcceptedReport = '10s'
+#
+#[CCIP.Groups.load.ExecOCRParams]
+#DeltaProgress = '100s'
+#DeltaResend = '5s'
+#DeltaRound = '40s'
+#DeltaGrace = '5s'
+#MaxDurationQuery = '100ms'
+#MaxDurationObservation = '20s'
+#MaxDurationReport = '8s'
+#MaxDurationShouldAcceptFinalizedReport = '5s'
+#MaxDurationShouldTransmitAcceptedReport = '8s'
 
 [CCIP.Groups.chaos]
 # uncomment the following with specific values of lane combinations to be tested, if you want to run your tests to run only on these specific network pairs

diff --git a/integration-tests/ccip-tests/testsetups/ccip.go b/integration-tests/ccip-tests/testsetups/ccip.go
@@ -735,8 +735,8 @@ func CCIPDefaultTestSetUp(
 			return setUpArgs
 		}
 	}
-	_, err = os.Stat(setUpArgs.LaneConfigFile)
-	if err == nil {
+	laneCfgFile, err := os.Stat(setUpArgs.LaneConfigFile)
+	if err == nil && laneCfgFile.Size() > 1 {
 		// remove the existing lane config file
 		err = os.Remove(setUpArgs.LaneConfigFile)
 		require.NoError(t, err, "error while removing existing lane config file - %s", setUpArgs.LaneConfigFile)