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.

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

Use network name instead of cluster name on sidecar #2303

Merged
merged 15 commits into from
Nov 13, 2024
Prev Previous commit
Next Next commit
fix lint
  • Loading branch information
sukantoraymond committed Nov 4, 2024
commit 00f6028b42a51c3c8e158a4a02924121ea087b28
2 changes: 0 additions & 2 deletions cmd/blockchaincmd/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
//network = models.NewNetworkFromCluster(network, clusterName)
}
}
// ask user if we want to use local machine if cluster is not provided
Expand Down Expand Up @@ -538,7 +537,6 @@ func deployBlockchain(cmd *cobra.Command, args []string) error {
return err
}
}
//network = models.NewNetworkFromCluster(network, clusterName)
nodeConfig := ""
if app.AvagoNodeConfigExists(blockchainName) {
nodeConfigBytes, err := os.ReadFile(app.GetAvagoNodeConfigPath(blockchainName))
Expand Down
2 changes: 0 additions & 2 deletions pkg/node/local.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ func TrackSubnetWithLocalMachine(
return err
}
clusterConfig := clustersConfig.Clusters[clusterName]
//network := clusterConfig.Network
network, err := GetNetworkFromCluster(clusterConfig)
if err != nil {
return err
Expand Down Expand Up @@ -141,7 +140,6 @@ func TrackSubnetWithLocalMachine(
return err
}
}
//sc.Networks[clusterConfig.Network.Name()] = networkInfo
sc.Networks[network.Name()] = networkInfo
if err := app.UpdateSidecar(&sc); err != nil {
return err
Expand Down
8 changes: 4 additions & 4 deletions tests/e2e/testcases/subnet/sov/etna/suite.go
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ func deployEtnaSubnetClusterFlagConvertOnly(clusterName string) {
func initPoaManagerClusterFlag(
subnetName string,
clusterName string,
) (string, error) {
) error {
cmd := exec.Command(
CLIBinary,
"contract",
Expand All @@ -192,7 +192,7 @@ func initPoaManagerClusterFlag(
utils.PrintStdErr(err)
}
gomega.Expect(err).Should(gomega.BeNil())
return string(output), err
return err
}

func initPoaManagerEtnaFlag(
Expand Down Expand Up @@ -251,7 +251,7 @@ var _ = ginkgo.Describe("[Etna Subnet SOV]", func() {
deployEtnaSubnetClusterFlagConvertOnly(testLocalNodeName)
_, err = commands.TrackLocalEtnaSubnet(testLocalNodeName, subnetName)
gomega.Expect(err).Should(gomega.BeNil())
_, err = initPoaManagerClusterFlag(subnetName, testLocalNodeName)
err = initPoaManagerClusterFlag(subnetName, testLocalNodeName)
gomega.Expect(err).Should(gomega.BeNil())
})

Expand All @@ -270,7 +270,7 @@ var _ = ginkgo.Describe("[Etna Subnet SOV]", func() {
deployEtnaSubnetEtnaFlagConvertOnly()
_, err := commands.TrackLocalEtnaSubnet(testLocalNodeName, subnetName)
gomega.Expect(err).Should(gomega.BeNil())
_, err = initPoaManagerClusterFlag(subnetName, testLocalNodeName)
err = initPoaManagerClusterFlag(subnetName, testLocalNodeName)
gomega.Expect(err).Should(gomega.BeNil())
})
})
Loading