From dfc399da715f16af1fcf6441ea5fc47b71800fa1 Mon Sep 17 00:00:00 2001
From: Ilja Pavlovs <ilja.pavlovs@gmail.com>
Date: Mon, 20 May 2024 19:29:59 +0300
Subject: [PATCH] VRF-1066: VRF e2e tests - parametrize waiting for 256 block
 timeout (#13197)

* VRF-1066: VRF e2e tests - parametrize waiting for 256 block timeout

* VRF-1066: minor changes
---
 integration-tests/load/vrfv2/vrfv2_test.go            | 2 +-
 integration-tests/load/vrfv2plus/vrfv2plus_test.go    | 2 +-
 integration-tests/smoke/vrfv2_test.go                 | 2 +-
 integration-tests/smoke/vrfv2plus_test.go             | 8 ++++----
 integration-tests/testconfig/vrfv2/vrfv2.toml         | 2 +-
 integration-tests/testconfig/vrfv2plus/vrfv2plus.toml | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/integration-tests/load/vrfv2/vrfv2_test.go b/integration-tests/load/vrfv2/vrfv2_test.go
index 04234a904ae..895e59a2b18 100644
--- a/integration-tests/load/vrfv2/vrfv2_test.go
+++ b/integration-tests/load/vrfv2/vrfv2_test.go
@@ -307,7 +307,7 @@ func TestVRFV2BHSPerformance(t *testing.T) {
 		latestBlockNumber, err := sethClient.Client.BlockNumber(testcontext.Get(t))
 		require.NoError(t, err)
 		_, err = actions.WaitForBlockNumberToBe(
-			latestBlockNumber+uint64(256),
+			latestBlockNumber+uint64(257),
 			sethClient,
 			&wgBlockNumberTobe,
 			configCopy.VRFv2.General.WaitFor256BlocksTimeout.Duration,
diff --git a/integration-tests/load/vrfv2plus/vrfv2plus_test.go b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
index 18ad008651f..b62f2815329 100644
--- a/integration-tests/load/vrfv2plus/vrfv2plus_test.go
+++ b/integration-tests/load/vrfv2plus/vrfv2plus_test.go
@@ -307,7 +307,7 @@ func TestVRFV2PlusBHSPerformance(t *testing.T) {
 		latestBlockNumber, err := sethClient.Client.BlockNumber(testcontext.Get(t))
 		require.NoError(t, err, "error getting latest block number")
 		_, err = actions.WaitForBlockNumberToBe(
-			latestBlockNumber+uint64(256),
+			latestBlockNumber+uint64(257),
 			sethClient,
 			&wgBlockNumberTobe,
 			configCopy.VRFv2Plus.General.WaitFor256BlocksTimeout.Duration,
diff --git a/integration-tests/smoke/vrfv2_test.go b/integration-tests/smoke/vrfv2_test.go
index 059325b1522..3fee1722cb0 100644
--- a/integration-tests/smoke/vrfv2_test.go
+++ b/integration-tests/smoke/vrfv2_test.go
@@ -900,7 +900,7 @@ func TestVRFV2WithBHS(t *testing.T) {
 			randRequestBlockNumber+uint64(257),
 			sethClient,
 			&wg,
-			time.Second*260,
+			configCopy.VRFv2.General.WaitFor256BlocksTimeout.Duration,
 			t,
 			l,
 		)
diff --git a/integration-tests/smoke/vrfv2plus_test.go b/integration-tests/smoke/vrfv2plus_test.go
index 8fac024f8fd..4007c7719f3 100644
--- a/integration-tests/smoke/vrfv2plus_test.go
+++ b/integration-tests/smoke/vrfv2plus_test.go
@@ -1331,7 +1331,7 @@ func TestVRFV2PlusWithBHS(t *testing.T) {
 			randRequestBlockNumber+uint64(257),
 			sethClient,
 			&wg,
-			time.Second*260,
+			configCopy.VRFv2Plus.General.WaitFor256BlocksTimeout.Duration,
 			t,
 			l,
 		)
@@ -1564,12 +1564,12 @@ func TestVRFV2PlusWithBHF(t *testing.T) {
 		randRequestBlockNumber := randomWordsRequestedEvent.Raw.BlockNumber
 		var wg sync.WaitGroup
 		wg.Add(1)
-		//Wait at least 260 blocks
+		//Wait at least 256 blocks
 		_, err = actions.WaitForBlockNumberToBe(
-			randRequestBlockNumber+uint64(260),
+			randRequestBlockNumber+uint64(257),
 			sethClient,
 			&wg,
-			time.Second*262,
+			configCopy.VRFv2Plus.General.WaitFor256BlocksTimeout.Duration,
 			t,
 			l,
 		)
diff --git a/integration-tests/testconfig/vrfv2/vrfv2.toml b/integration-tests/testconfig/vrfv2/vrfv2.toml
index 56257b9c1a6..4ed62e3b7a7 100644
--- a/integration-tests/testconfig/vrfv2/vrfv2.toml
+++ b/integration-tests/testconfig/vrfv2/vrfv2.toml
@@ -74,7 +74,7 @@ number_of_sending_keys_to_create = 0
 randomness_request_count_per_request = 1
 randomness_request_count_per_request_deviation = 0
 random_words_fulfilled_event_timeout = "2m"
-wait_for_256_blocks_timeout = "10m"
+wait_for_256_blocks_timeout = "280s"
 wrapped_gas_overhead = 50000
 coordinator_gas_overhead = 52000
 wrapper_premium_percentage = 25
diff --git a/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml b/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml
index e441e647949..e1fb1789596 100644
--- a/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml
+++ b/integration-tests/testconfig/vrfv2plus/vrfv2plus.toml
@@ -70,7 +70,7 @@ number_of_sending_keys_to_create = 0
 randomness_request_count_per_request = 1
 randomness_request_count_per_request_deviation = 0
 random_words_fulfilled_event_timeout = "2m"
-wait_for_256_blocks_timeout = "10m"
+wait_for_256_blocks_timeout = "280s"
 
 fulfillment_flat_fee_native_ppm=0
 fulfillment_flat_fee_link_discount_ppm=0