wip

Author: skudasov

framework/clclient/client.go

@@ -14,7 +14,6 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/go-resty/resty/v2"
-	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"golang.org/x/sync/errgroup"
 )
@@ -57,14 +56,13 @@ func NewChainlinkClient(c *Config) (*ChainlinkClient, error) {
 	}, nil
 }
 
-// NewCLDefaultClients connects all the clients using clnode.Output and default login/password
-func NewCLDefaultClients(outs []*clnode.Output, l zerolog.Logger) ([]*ChainlinkClient, error) {
+func New(outs []*clnode.Output) ([]*ChainlinkClient, error) {
 	clients := make([]*ChainlinkClient, 0)
 	for _, out := range outs {
 		c, err := NewChainlinkClient(&Config{
 			URL:      out.Node.HostURL,
-			Email:    clnode.DefaultAPIUser,
-			Password: clnode.DefaultAPIPassword,
+			Email:    out.Node.APIAuthUser,
+			Password: out.Node.APIAuthPassword,
 		})
 		if err != nil {
 			return nil, err

framework/components/clnode/clnode.go

@@ -63,10 +63,12 @@ type Output struct {
 
 // NodeOut is CL node container output, URLs to connect
 type NodeOut struct {
-	HostURL      string `toml:"url"`
-	HostP2PURL   string `toml:"p2p_url"`
-	DockerURL    string `toml:"docker_internal_url"`
-	DockerP2PUrl string `toml:"p2p_docker_internal_url"`
+	APIAuthUser     string `toml:"api_auth_user"`
+	APIAuthPassword string `toml:"api_auth_password"`
+	HostURL         string `toml:"url"`
+	HostP2PURL      string `toml:"p2p_url"`
+	DockerURL       string `toml:"docker_internal_url"`
+	DockerP2PUrl    string `toml:"p2p_docker_internal_url"`
 }
 
 // NewNodeWithDB create a new Chainlink node with some image:tag and one or several configs
@@ -285,10 +287,12 @@ func newNode(in *Input, pgOut *postgres.Output) (*NodeOut, error) {
 	mpP2P := nat.Port(fmt.Sprintf("%d/udp", in.Node.P2PPort))
 
 	return &NodeOut{
-		HostURL:      fmt.Sprintf("http://%s:%s", host, mp.Port()),
-		HostP2PURL:   fmt.Sprintf("http://%s:%s", host, mpP2P.Port()),
-		DockerURL:    fmt.Sprintf("http://%s:%s", containerName, DefaultHTTPPort),
-		DockerP2PUrl: fmt.Sprintf("http://%s:%s", containerName, DefaultP2PPort),
+		APIAuthUser:     DefaultAPIUser,
+		APIAuthPassword: DefaultAPIPassword,
+		HostURL:         fmt.Sprintf("http://%s:%s", host, mp.Port()),
+		HostP2PURL:      fmt.Sprintf("http://%s:%s", host, mpP2P.Port()),
+		DockerURL:       fmt.Sprintf("http://%s:%s", containerName, DefaultHTTPPort),
+		DockerP2PUrl:    fmt.Sprintf("http://%s:%s", containerName, DefaultP2PPort),
 	}, nil
 }
 

framework/examples/myproject/chaos_test.go

@@ -34,7 +34,7 @@ func TestChaos(t *testing.T) {
 	out, err := ns.NewSharedDBNodeSet(in.NodeSet, bc, dp.BaseURLDocker)
 	require.NoError(t, err)
 
-	c, err := clclient.NewCLDefaultClients(out.CLNodes, framework.L)
+	c, err := clclient.New(out.CLNodes)
 	require.NoError(t, err)
 
 	t.Run("run the cluster and test various chaos scenarios", func(t *testing.T) {

framework/examples/myproject/performance_baseline_test.go

@@ -37,7 +37,7 @@ func TestPerformanceBaseline(t *testing.T) {
 		lokiCfg = wasp.NewEnvLokiConfig()
 	}
 
-	c, err := clclient.NewCLDefaultClients(out.CLNodes, framework.L)
+	c, err := clclient.New(out.CLNodes)
 	require.NoError(t, err)
 
 	t.Run("performance baseline for your product", func(t *testing.T) {

framework/examples/myproject/scalability_test.go

@@ -38,7 +38,7 @@ func TestScalability(t *testing.T) {
 		lokiCfg = wasp.NewEnvLokiConfig()
 	}
 
-	c, err := clclient.NewCLDefaultClients(out.CLNodes, framework.L)
+	c, err := clclient.New(out.CLNodes)
 	require.NoError(t, err)
 
 	t.Run("scalability test for your product", func(t *testing.T) {

framework/examples/myproject/upgrade.toml

@@ -19,7 +19,6 @@
       pull_image = true
 
     [nodeset.node_specs.node]
-      custom_ports = [14000, 14001]
       image = "public.ecr.aws/chainlink/chainlink:v2.16.0"
       pull_image = false
 

framework/examples/myproject/upgrade_test.go

@@ -1,13 +1,15 @@
 package examples
 
 import (
+	"fmt"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework/clclient"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/framework/components/fake"
 	ns "github.com/smartcontractkit/chainlink-testing-framework/framework/components/simple_node_set"
 	"github.com/stretchr/testify/require"
 	"testing"
+	"time"
 )
 
 const (
@@ -48,28 +50,28 @@ func TestUpgrade(t *testing.T) {
 	out, err := ns.NewSharedDBNodeSet(in.NodeSet, bc, dp.BaseURLDocker)
 	require.NoError(t, err)
 
-	c, err := clclient.NewCLDefaultClients(out.CLNodes, framework.L)
+	c, err := clclient.New(out.CLNodes)
 	require.NoError(t, err)
 	_, _, err = c[0].CreateJobRaw(testJob)
 	require.NoError(t, err)
 
-	//	in.NodeSet.NodeSpecs[0].Node.Image = "public.ecr.aws/chainlink/chainlink:v2.17.0"
-	//	in.NodeSet.NodeSpecs[0].Node.UserConfigOverrides = `
-	//										[Log]
-	//										level = 'info'
-	//`
-	//	in.NodeSet.NodeSpecs[4].Node.Image = "public.ecr.aws/chainlink/chainlink:v2.17.0"
-	//	in.NodeSet.NodeSpecs[4].Node.UserConfigOverrides = `
-	//										[Log]
-	//										level = 'info'
-	//`
-	//
-	//	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 3*time.Second)
-	//	require.NoError(t, err)
-	//
-	//	jobs, _, err := c[0].ReadJobs()
-	//	require.NoError(t, err)
-	//	fmt.Println(jobs)
+	in.NodeSet.NodeSpecs[0].Node.Image = "public.ecr.aws/chainlink/chainlink:v2.17.0"
+	in.NodeSet.NodeSpecs[0].Node.UserConfigOverrides = `
+											[Log]
+											level = 'info'
+	`
+	in.NodeSet.NodeSpecs[4].Node.Image = "public.ecr.aws/chainlink/chainlink:v2.17.0"
+	in.NodeSet.NodeSpecs[4].Node.UserConfigOverrides = `
+											[Log]
+											level = 'info'
+	`
+
+	out, err = ns.UpgradeNodeSet(in.NodeSet, bc, dp.BaseURLDocker, 3*time.Second)
+	require.NoError(t, err)
+
+	jobs, _, err := c[0].ReadJobs()
+	require.NoError(t, err)
+	fmt.Println(jobs)
 
 	t.Run("test something", func(t *testing.T) {
 		for _, n := range out.CLNodes {