Fixes old pointer aliases

smartcontractkit · Nov 6, 2023 · 7691dea · 7691dea
1 parent 0f66f7f
commit 7691dea
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 30 deletions.
diff --git a/integration-tests/chaos/automation_chaos_test.go b/integration-tests/chaos/automation_chaos_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/chaos"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
-	a "github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/alias"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/cdk8s/blockscout"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/chainlink"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/ethereum"
@@ -132,7 +131,7 @@ func TestAutomationChaos(t *testing.T) {
 					chainlink.New(0, defaultAutomationSettings),
 					chaos.NewFailPods,
 					&chaos.Props{
-						LabelsSelector: &map[string]*string{ChaosGroupMinority: a.Str("1")},
+						LabelsSelector: &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 						DurationStr:    "1m",
 					},
 				},
@@ -141,7 +140,7 @@ func TestAutomationChaos(t *testing.T) {
 					chainlink.New(0, defaultAutomationSettings),
 					chaos.NewFailPods,
 					&chaos.Props{
-						LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+						LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 						DurationStr:    "1m",
 					},
 				},
@@ -150,18 +149,18 @@ func TestAutomationChaos(t *testing.T) {
 					chainlink.New(0, defaultAutomationSettings),
 					chaos.NewFailPods,
 					&chaos.Props{
-						LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+						LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 						DurationStr:    "1m",
-						ContainerNames: &[]*string{a.Str("chainlink-db")},
+						ContainerNames: &[]*string{utils.Ptr("chainlink-db")},
 					},
 				},
 				NetworkChaosFailMajorityNetwork: {
 					ethereum.New(defaultEthereumSettings),
 					chainlink.New(0, defaultAutomationSettings),
 					chaos.NewNetworkPartition,
 					&chaos.Props{
-						FromLabels:  &map[string]*string{ChaosGroupMajority: a.Str("1")},
-						ToLabels:    &map[string]*string{ChaosGroupMinority: a.Str("1")},
+						FromLabels:  &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
+						ToLabels:    &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 						DurationStr: "1m",
 					},
 				},
@@ -170,8 +169,8 @@ func TestAutomationChaos(t *testing.T) {
 					chainlink.New(0, defaultAutomationSettings),
 					chaos.NewNetworkPartition,
 					&chaos.Props{
-						FromLabels:  &map[string]*string{"app": a.Str("geth")},
-						ToLabels:    &map[string]*string{ChaosGroupMajorityPlus: a.Str("1")},
+						FromLabels:  &map[string]*string{"app": utils.Ptr("geth")},
+						ToLabels:    &map[string]*string{ChaosGroupMajorityPlus: utils.Ptr("1")},
 						DurationStr: "1m",
 					},
 				},

diff --git a/integration-tests/chaos/ocr2vrf_chaos_test.go b/integration-tests/chaos/ocr2vrf_chaos_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/chaos"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
-	a "github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/alias"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/chainlink"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/logging"
@@ -68,7 +67,7 @@ func TestOCR2VRFChaos(t *testing.T) {
 			chainlink.New(0, defaultOCR2VRFSettings),
 			chaos.NewFailPods,
 			&chaos.Props{
-				LabelsSelector: &map[string]*string{ChaosGroupMinority: a.Str("1")},
+				LabelsSelector: &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 				DurationStr:    "1m",
 			},
 		},
@@ -78,7 +77,7 @@ func TestOCR2VRFChaos(t *testing.T) {
 		//	chainlink.New(0, defaultOCR2VRFSettings),
 		//	chaos.NewFailPods,
 		//	&chaos.Props{
-		//		LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+		//		LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 		//		DurationStr:    "1m",
 		//	},
 		//},
@@ -88,18 +87,18 @@ func TestOCR2VRFChaos(t *testing.T) {
 		//	chainlink.New(0, defaultOCR2VRFSettings),
 		//	chaos.NewFailPods,
 		//	&chaos.Props{
-		//		LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+		//		LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 		//		DurationStr:    "1m",
-		//		ContainerNames: &[]*string{a.Str("chainlink-db")},
+		//		ContainerNames: &[]*string{utils.Ptr("chainlink-db")},
 		//	},
 		//},
 		//NetworkChaosFailMajorityNetwork: {
 		//	ethereum.New(defaultOCR2VRFEthereumSettings),
 		//	chainlink.New(0, defaultOCR2VRFSettings),
 		//	chaos.NewNetworkPartition,
 		//	&chaos.Props{
-		//		FromLabels:  &map[string]*string{ChaosGroupMajority: a.Str("1")},
-		//		ToLabels:    &map[string]*string{ChaosGroupMinority: a.Str("1")},
+		//		FromLabels:  &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
+		//		ToLabels:    &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 		//		DurationStr: "1m",
 		//	},
 		//},
@@ -108,8 +107,8 @@ func TestOCR2VRFChaos(t *testing.T) {
 		//	chainlink.New(0, defaultOCR2VRFSettings),
 		//	chaos.NewNetworkPartition,
 		//	&chaos.Props{
-		//		FromLabels:  &map[string]*string{"app": a.Str("geth")},
-		//		ToLabels:    &map[string]*string{ChaosGroupMajority: a.Str("1")},
+		//		FromLabels:  &map[string]*string{"app": utils.Ptr("geth")},
+		//		ToLabels:    &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 		//		DurationStr: "1m",
 		//	},
 		//},

diff --git a/integration-tests/chaos/ocr_chaos_test.go b/integration-tests/chaos/ocr_chaos_test.go
@@ -15,7 +15,6 @@ import (
 	ctfClient "github.com/smartcontractkit/chainlink-testing-framework/client"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/chaos"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
-	a "github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/alias"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/chainlink"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/ethereum"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/mockserver"
@@ -81,8 +80,8 @@ func TestOCRChaos(t *testing.T) {
 			chainlink.New(0, defaultOCRSettings),
 			chaos.NewNetworkPartition,
 			&chaos.Props{
-				FromLabels:  &map[string]*string{ChaosGroupMajority: a.Str("1")},
-				ToLabels:    &map[string]*string{ChaosGroupMinority: a.Str("1")},
+				FromLabels:  &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
+				ToLabels:    &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 				DurationStr: "1m",
 			},
 		},
@@ -91,8 +90,8 @@ func TestOCRChaos(t *testing.T) {
 			chainlink.New(0, defaultOCRSettings),
 			chaos.NewNetworkPartition,
 			&chaos.Props{
-				FromLabels:  &map[string]*string{"app": a.Str("geth")},
-				ToLabels:    &map[string]*string{ChaosGroupMajorityPlus: a.Str("1")},
+				FromLabels:  &map[string]*string{"app": utils.Ptr("geth")},
+				ToLabels:    &map[string]*string{ChaosGroupMajorityPlus: utils.Ptr("1")},
 				DurationStr: "1m",
 			},
 		},
@@ -101,7 +100,7 @@ func TestOCRChaos(t *testing.T) {
 			chainlink.New(0, defaultOCRSettings),
 			chaos.NewFailPods,
 			&chaos.Props{
-				LabelsSelector: &map[string]*string{ChaosGroupMinority: a.Str("1")},
+				LabelsSelector: &map[string]*string{ChaosGroupMinority: utils.Ptr("1")},
 				DurationStr:    "1m",
 			},
 		},
@@ -110,7 +109,7 @@ func TestOCRChaos(t *testing.T) {
 			chainlink.New(0, defaultOCRSettings),
 			chaos.NewFailPods,
 			&chaos.Props{
-				LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+				LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 				DurationStr:    "1m",
 			},
 		},
@@ -119,9 +118,9 @@ func TestOCRChaos(t *testing.T) {
 			chainlink.New(0, defaultOCRSettings),
 			chaos.NewFailPods,
 			&chaos.Props{
-				LabelsSelector: &map[string]*string{ChaosGroupMajority: a.Str("1")},
+				LabelsSelector: &map[string]*string{ChaosGroupMajority: utils.Ptr("1")},
 				DurationStr:    "1m",
-				ContainerNames: &[]*string{a.Str("chainlink-db")},
+				ContainerNames: &[]*string{utils.Ptr("chainlink-db")},
 			},
 		},
 	}

diff --git a/integration-tests/reorg/reorg_confirmer.go b/integration-tests/reorg/reorg_confirmer.go
@@ -14,8 +14,9 @@ import (
 	"github.com/smartcontractkit/chainlink-testing-framework/blockchain"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/chaos"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/environment"
-	a "github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/alias"
 	"github.com/smartcontractkit/chainlink-testing-framework/k8s/pkg/helm/reorg"
+
+	"github.com/smartcontractkit/chainlink/integration-tests/utils"
 )
 
 // The steps are:
@@ -231,8 +232,8 @@ func (rc *ReorgController) forkNetwork(header blockchain.NodeHeader) error {
 			rc.cfg.Env.Cfg.Namespace,
 			&chaos.Props{
 				DurationStr: "999h",
-				FromLabels:  &map[string]*string{"app": a.Str(reorg.TXNodesAppLabel)},
-				ToLabels:    &map[string]*string{"app": a.Str(reorg.MinerNodesAppLabel)},
+				FromLabels:  &map[string]*string{"app": utils.Ptr(reorg.TXNodesAppLabel)},
+				ToLabels:    &map[string]*string{"app": utils.Ptr(reorg.MinerNodesAppLabel)},
 			},
 		))
 	rc.chaosExperimentName = expName