VRF-897: refactoring VRF v2 and V2 Plus e2e tests

.github/workflows/integration-tests.yml

@@ -517,7 +517,7 @@ jobs:
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2-evm-simulated
           - name: vrfv2plus
-            nodes: 5
+            nodes: 6
             os: ubuntu-latest
             pyroscope_env: ci-smoke-vrf2plus-evm-simulated
           - name: forwarder_ocr

.github/workflows/on-demand-vrfv2-performance-test.yml

@@ -70,7 +70,7 @@ jobs:
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
         with:
-          test_command_to_run: cd ./integration-tests/load && go test -v -count=1 -timeout 24h -run TestVRFV2Performance/vrfv2_performance_test ./vrfv2
+          test_command_to_run: cd ./integration-tests/load && go test -v -count=1 -timeout 24h -run TestVRFV2Performance ./vrfv2
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ env.CHAINLINK_VERSION }}

.github/workflows/on-demand-vrfv2plus-performance-test.yml

@@ -71,7 +71,7 @@ jobs:
       - name: Run Tests
         uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/run-tests@5bee84d30d90295010bda68b0cd46be3a1eea917 # v2.3.9
         with:
-          test_command_to_run: cd ./integration-tests/load && go test -v -count=1 -timeout 24h -run TestVRFV2PlusPerformance/vrfv2plus_performance_test ./vrfv2plus
+          test_command_to_run: cd ./integration-tests/load && go test -v -count=1 -timeout 24h -run TestVRFV2PlusPerformance ./vrfv2plus
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
           cl_image_tag: ${{ env.CHAINLINK_VERSION }}

integration-tests/actions/vrf/common/actions.go

@@ -12,6 +12,7 @@ import (
 	"github.com/rs/zerolog"
 
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
+	"github.com/smartcontractkit/chainlink-testing-framework/utils/conversions"
 	"github.com/smartcontractkit/chainlink/integration-tests/actions"
 	"github.com/smartcontractkit/chainlink/integration-tests/client"
 	"github.com/smartcontractkit/chainlink/integration-tests/contracts"
@@ -191,14 +192,17 @@ func retrieveLoadTestMetrics(
 	metricsChannel <- metrics
 }
 
-func CreateNodeTypeToNodeMap(cluster *test_env.ClCluster, nodesToCreate []VRFNodeType) map[VRFNodeType]*VRFNode {
+func CreateNodeTypeToNodeMap(cluster *test_env.ClCluster, nodesToCreate []VRFNodeType) (map[VRFNodeType]*VRFNode, error) {
 	var nodesMap = make(map[VRFNodeType]*VRFNode)
+	if len(cluster.Nodes) < len(nodesToCreate) {
+		return nil, fmt.Errorf("not enough nodes in the cluster (cluster size is %d nodes) to create %d nodes", len(cluster.Nodes), len(nodesToCreate))
+	}
 	for i, nodeType := range nodesToCreate {
 		nodesMap[nodeType] = &VRFNode{
 			CLNode: cluster.Nodes[i],
 		}
 	}
-	return nodesMap
+	return nodesMap, nil
 }
 
 func CreateVRFKeyOnVRFNode(vrfNode *VRFNode, l zerolog.Logger) (*client.VRFKey, string, error) {
@@ -216,3 +220,35 @@ func CreateVRFKeyOnVRFNode(vrfNode *VRFNode, l zerolog.Logger) (*client.VRFKey,
 		Msg("VRF Key created on the Node")
 	return vrfKey, pubKeyCompressed, nil
 }
+
+func FundNodesIfNeeded(ctx context.Context, existingEnvConfig *vrf_common_config.ExistingEnvConfig, client blockchain.EVMClient, l zerolog.Logger) error {
+	if *existingEnvConfig.NodeSendingKeyFundingMin > 0 {
+		for _, sendingKey := range existingEnvConfig.NodeSendingKeys {
+			address := common.HexToAddress(sendingKey)
+			sendingKeyBalance, err := client.BalanceAt(ctx, address)
+			if err != nil {
+				return err
+			}
+			fundingAtLeast := conversions.EtherToWei(big.NewFloat(*existingEnvConfig.NodeSendingKeyFundingMin))
+			fundingToSendWei := new(big.Int).Sub(fundingAtLeast, sendingKeyBalance)
+			fundingToSendEth := conversions.WeiToEther(fundingToSendWei)
+			log := l.Info().
+				Str("Sending Key", sendingKey).
+				Str("Sending Key Current Balance", sendingKeyBalance.String()).
+				Str("Should have at least", fundingAtLeast.String())
+			if fundingToSendWei.Cmp(big.NewInt(0)) == 1 {
+				log.
+					Str("Funding Amount in ETH", fundingToSendEth.String()).
+					Msg("Funding Node's Sending Key")
+				err := actions.FundAddress(client, sendingKey, fundingToSendEth)
+				if err != nil {
+					return err
+				}
+			} else {
+				log.
+					Msg("Skipping Node's Sending Key funding as it has enough funds")
+			}
+		}
+	}
+	return nil
+}

integration-tests/actions/vrf/common/models.go

@@ -46,8 +46,10 @@ type VRFContracts struct {
 	CoordinatorV2Plus contracts.VRFCoordinatorV2_5
 	VRFOwner          contracts.VRFOwner
 	BHS               contracts.BlockHashStore
-	VRFV2Consumer     []contracts.VRFv2LoadTestConsumer
+	VRFV2Consumers    []contracts.VRFv2LoadTestConsumer
 	VRFV2PlusConsumer []contracts.VRFv2PlusLoadTestConsumer
+	LinkToken         contracts.LinkToken
+	MockETHLINKFeed   contracts.VRFMockETHLINKFeed
 }
 
 type VRFOwnerConfig struct {
@@ -74,3 +76,10 @@ type VRFJobSpecConfig struct {
 type VRFLoadTestConsumer interface {
 	GetLoadTestMetrics(ctx context.Context) (*contracts.VRFLoadTestMetrics, error)
 }
+
+type NewEnvConfig struct {
+	NodesToCreate          []VRFNodeType
+	NumberOfTxKeysToCreate int
+	UseVRFOwner            bool
+	UseTestCoordinator     bool
+}