Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes Old Pointer Aliases #11187

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Fixes Old Pointer Aliases #11187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions integration-tests/chaos/automation_chaos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
},
},
Expand All @@ -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",
},
},
Expand All @@ -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",
},
},
Expand All @@ -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",
},
},
Expand Down
17 changes: 8 additions & 9 deletions integration-tests/chaos/ocr2vrf_chaos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
},
},
Expand All @@ -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",
// },
//},
Expand All @@ -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",
// },
//},
Expand All @@ -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",
// },
//},
Expand Down
17 changes: 8 additions & 9 deletions integration-tests/chaos/ocr_chaos_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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",
},
},
Expand All @@ -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",
},
},
Expand All @@ -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",
},
},
Expand All @@ -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",
},
},
Expand All @@ -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")},
},
},
}
Expand Down
7 changes: 4 additions & 3 deletions integration-tests/reorg/reorg_confirmer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Loading