From 4fcf52597139668613ce545c435907acba3006a2 Mon Sep 17 00:00:00 2001 From: Bartek Tofel Date: Thu, 28 Nov 2024 11:11:35 +0100 Subject: [PATCH] fix compilation --- .tool-versions | 2 +- integration-tests/common/common.go | 11 +++++++++-- integration-tests/go.mod | 4 +--- ops/devnet/environment.go | 6 ++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.tool-versions b/.tool-versions index 7fe072643..35ddf9e85 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,7 +1,7 @@ # Languages nodejs 18.6.0 yarn 1.22.19 -golang 1.21.5 +golang 1.23.3 python 3.9.13 # Tools diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go index 06819ba7e..523a603d6 100644 --- a/integration-tests/common/common.go +++ b/integration-tests/common/common.go @@ -12,6 +12,8 @@ import ( "github.com/google/uuid" "github.com/lib/pq" "github.com/rs/zerolog/log" + "gopkg.in/guregu/null.v4" + ctfconfig "github.com/smartcontractkit/chainlink-testing-framework/lib/config" "github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/environment" "github.com/smartcontractkit/chainlink-testing-framework/lib/k8s/pkg/helm/chainlink" @@ -100,10 +102,15 @@ func New(testConfig *testconfig.TestConfig) *Common { func (c *Common) Default(t *testing.T, namespacePrefix string) (*Common, error) { productName := "data-feedsv2.0" nsLabels, err := environment.GetRequiredChainLinkNamespaceLabels(productName, "soak") - require.NoError(o.t, err, "Error creating required chain.link labels for namespace") + if err != nil { + return nil, err + } workloadPodLabels, err := environment.GetRequiredChainLinkWorkloadAndPodLabels(productName, "soak") - require.NoError(o.t, err, "Error creating required chain.link labels for workloads and pods") + if err != nil { + return nil, err + } + c.TestEnvDetails.K8Config = &environment.Config{ NamespacePrefix: fmt.Sprintf("starknet-%s", namespacePrefix), TTL: c.TestEnvDetails.TestDuration, diff --git a/integration-tests/go.mod b/integration-tests/go.mod index c1246f07a..4c0cc92e7 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -2,8 +2,6 @@ module github.com/smartcontractkit/chainlink-starknet/integration-tests go 1.23 -toolchain go1.23.3 - require ( github.com/NethermindEth/juno v0.3.1 github.com/NethermindEth/starknet.go v0.7.1-0.20240401080518-34a506f3cfdb @@ -24,6 +22,7 @@ require ( github.com/testcontainers/testcontainers-go v0.34.0 go.uber.org/zap v1.27.0 golang.org/x/text v0.19.0 + gopkg.in/guregu/null.v4 v4.0.0 ) require ( @@ -490,7 +489,6 @@ require ( google.golang.org/grpc v1.65.0 // indirect google.golang.org/protobuf v1.34.2 // indirect gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect - gopkg.in/guregu/null.v4 v4.0.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect diff --git a/ops/devnet/environment.go b/ops/devnet/environment.go index 1ff8c17bf..cc375c3ca 100644 --- a/ops/devnet/environment.go +++ b/ops/devnet/environment.go @@ -52,6 +52,12 @@ func (m Chart) GetVersion() string { return m.HelmProps.Version } +func (m Chart) GetLabels() map[string]string { + return map[string]string{ + "chain.link/component": "starknet-validator", + } +} + func (m Chart) ExportData(e *environment.Environment) error { devnetLocalHTTP, err := e.Fwd.FindPort("starknet-dev:0", "starknetdev", "http").As(client.LocalConnection, client.HTTP) if err != nil {