Go mod tidy

smartcontractkit · Feb 27, 2024 · c0a8b95 · c0a8b95
1 parent 70d8fe1
commit c0a8b95
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/integration-tests/common/common.go b/integration-tests/common/common.go
@@ -70,12 +70,17 @@ type RPCDetails struct {
 
 func New(testConfig *testconfig.TestConfig) *Common {
 	var c *Common
+	l2RpcUrl := DefaultL2RPCInternal
 
 	duration, err := time.ParseDuration(*testConfig.OCR2.TestDuration)
 	if err != nil {
 		panic("Invalid test duration")
 	}
 
+	if *testConfig.Common.Network == "testnet" {
+		l2RpcUrl = *testConfig.Common.L2RPCUrl
+	}
+
 	c = &Common{
 		TestConfig: testConfig,
 		ChainDetails: &ChainDetails{
@@ -87,7 +92,7 @@ func New(testConfig *testconfig.TestConfig) *Common {
 		},
 		RPCDetails: &RPCDetails{
 			P2PPort:       "6690",
-			RPCL2Internal: DefaultL2RPCInternal,
+			RPCL2Internal: l2RpcUrl,
 		},
 	}
 
@@ -112,7 +117,7 @@ func (c *Common) Default(t *testing.T, namespacePrefix string) (*Common, error)
 			AddHelm(mock_adapter.New(nil)).
 			AddHelm(chainlink.New(0, map[string]interface{}{
 				"toml":     tomlString,
-				"replicas": c.TestConfig.OCR2.NodeCount,
+				"replicas": *c.TestConfig.OCR2.NodeCount,
 			}))
 	}
 

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -5,9 +5,12 @@ go 1.21.4
 require (
 	github.com/NethermindEth/juno v0.3.1
 	github.com/NethermindEth/starknet.go v0.6.1-0.20231218140327-915109ab5bc1
+	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df
 	github.com/go-resty/resty/v2 v2.7.0
 	github.com/google/uuid v1.4.0
 	github.com/lib/pq v1.10.9
+	github.com/pelletier/go-toml/v2 v2.1.1
+	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.30.0
 	github.com/smartcontractkit/chainlink-common v0.1.7-0.20240213113935-001c2f4befd4
 	github.com/smartcontractkit/chainlink-starknet/ops v0.0.0-20231205180940-ea2e3e916725
@@ -17,6 +20,8 @@ require (
 	github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240215151806-009c99876c4c
 	github.com/stretchr/testify v1.8.4
 	github.com/testcontainers/testcontainers-go v0.23.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/text v0.14.0
 	gopkg.in/guregu/null.v4 v4.0.0
 )
 
@@ -66,7 +71,6 @@ require (
 	github.com/aws/constructs-go/constructs/v10 v10.1.255 // indirect
 	github.com/aws/jsii-runtime-go v1.75.0 // indirect
 	github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59 // indirect
-	github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect
 	github.com/blendle/zapdriver v1.3.1 // indirect
@@ -317,11 +321,9 @@ require (
 	github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
 	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pelletier/go-toml/v2 v2.1.1 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/petermattis/goid v0.0.0-20230317030725-371a4b8eda08 // indirect
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/prometheus/alertmanager v0.26.0 // indirect
@@ -419,7 +421,6 @@ require (
 	go.uber.org/goleak v1.3.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/ratelimit v0.2.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
 	go4.org/netipx v0.0.0-20230125063823-8449b0a6169f // indirect
 	golang.org/x/arch v0.7.0 // indirect
 	golang.org/x/crypto v0.19.0 // indirect
@@ -430,7 +431,6 @@ require (
 	golang.org/x/sync v0.6.0 // indirect
 	golang.org/x/sys v0.17.0 // indirect
 	golang.org/x/term v0.17.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	golang.org/x/tools v0.18.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect

diff --git a/integration-tests/smoke/ocr2_test.go b/integration-tests/smoke/ocr2_test.go
@@ -45,7 +45,7 @@ func TestOCRBasicNew(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 			logging.Init()
-			state, err := common.NewOCRv2State(t, "test", &config)
+			state, err := common.NewOCRv2State(t, "smoke-ocr2", &config)
 			require.NoError(t, err, "Could not setup the ocrv2 state")
 
 			// Cleanup K8s

diff --git a/integration-tests/testconfig/default.toml b/integration-tests/testconfig/default.toml
@@ -1,3 +1,5 @@
+# This is the default configuration so OCR2 tests can run without issues
+
 [Logging]
 test_log_collect=false