Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 3 additions & 8 deletions pkg/localnet/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,9 @@ import (
func UpdateBlockchainConfig(
app *application.Avalanche,
networkDir string,
networkModel models.Network,
blockchainName string,
) error {
networkModel, err := GetNetworkModel(networkDir)
if err != nil {
return err
}
sc, err := app.LoadSidecar(blockchainName)
if err != nil {
return err
Expand Down Expand Up @@ -114,19 +111,17 @@ func TrackSubnet(
printFunc func(msg string, args ...interface{}),
blockchainName string,
networkDir string,
networkModel models.Network,
wallet *primary.Wallet,
) error {
if err := UpdateBlockchainConfig(
app,
networkDir,
networkModel,
blockchainName,
); err != nil {
return err
}
networkModel, err := GetNetworkModel(networkDir)
if err != nil {
return err
}
sc, err := app.LoadSidecar(blockchainName)
if err != nil {
return err
Expand Down
21 changes: 19 additions & 2 deletions pkg/localnet/localcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,14 @@ func GetLocalClusterNetworkModel(
clusterName string,
) (models.Network, error) {
networkDir := GetLocalClusterDir(app, clusterName)
return GetNetworkModel(networkDir)
networkModel, err := GetNetworkModel(networkDir)
if err != nil {
return networkModel, err
}
if networkModel.Kind == models.Devnet {
networkModel.ClusterName = clusterName
}
return networkModel, nil
}

// Gets a list of clusters connected to local network that are also running
Expand Down Expand Up @@ -574,11 +581,16 @@ func LocalClusterTrackSubnet(
return fmt.Errorf("local cluster %q is not found", clusterName)
}
networkDir := GetLocalClusterDir(app, clusterName)
networkModel, err := GetLocalClusterNetworkModel(app, clusterName)
if err != nil {
return err
}
return TrackSubnet(
app,
printFunc,
blockchainName,
networkDir,
networkModel,
nil,
)
}
Expand All @@ -595,6 +607,10 @@ func LoadLocalCluster(
if !LocalClusterExists(app, clusterName) {
return fmt.Errorf("local cluster %q is not found", clusterName)
}
networkModel, err := GetLocalClusterNetworkModel(app, clusterName)
if err != nil {
return err
}
networkDir := GetLocalClusterDir(app, clusterName)
blockchains, err := GetLocalClusterManagedTrackedBlockchains(app, clusterName)
if err != nil {
Expand All @@ -605,12 +621,13 @@ func LoadLocalCluster(
if err := UpdateBlockchainConfig(
app,
networkDir,
networkModel,
blockchainName,
); err != nil {
return err
}
}
networkModel, err := GetLocalClusterNetworkModel(app, clusterName)
networkModel, err = GetLocalClusterNetworkModel(app, clusterName)
if err != nil {
return err
}
Expand Down
1 change: 1 addition & 0 deletions pkg/localnet/localnetHelpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func LocalNetworkTrackSubnet(
printFunc,
blockchainName,
networkDir,
networkModel,
wallet,
)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/models/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func NetworkFromNetworkID(networkID uint32) Network {
case constants.LocalNetworkID:
return NewLocalNetwork()
}
return UndefinedNetwork
return NewDevnetNetwork("", networkID)
}

func (n Network) StandardPublicEndpoint() bool {
Expand Down
Loading