introduce network.Name()

cmd/keycmd/list.go

@@ -125,7 +125,7 @@ func getClients(networks []models.Network, cchain bool) (
 	for _, network := range networks {
 		pClients[network] = platformvm.NewClient(network.Endpoint)
 		if cchain {
-			cClients[network], err = ethclient.Dial(fmt.Sprintf("%s/ext/bc/%s/rpc", network.Endpoint, "C"))
+			cClients[network], err = ethclient.Dial(network.CChainEndpoint())
 			if err != nil {
 				return nil, nil, err
 			}
@@ -330,7 +330,7 @@ func getPChainAddrInfo(
 		chain:   "P-Chain (Bech32 format)",
 		address: pChainAddr,
 		balance: balance,
-		network: network.Kind.String(),
+		network: network.Name(),
 	}, nil
 }
 
@@ -354,7 +354,7 @@ func getCChainAddrInfo(
 		chain:   "C-Chain (Ethereum hex format)",
 		address: cChainAddr,
 		balance: cChainBalance,
-		network: network.Kind.String(),
+		network: network.Name(),
 	}, nil
 }
 

cmd/nodecmd/status.go

@@ -103,7 +103,7 @@ func statusNode(_ *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		blockchainID := sc.Networks[network.Kind.String()].BlockchainID
+		blockchainID := sc.Networks[network.Name()].BlockchainID
 		if blockchainID == ids.Empty {
 			return ErrNoBlockchainID
 		}

cmd/nodecmd/validatePrimary.go

@@ -436,7 +436,7 @@ func convertNanoAvaxToAvaxString(weight uint64) string {
 
 func PrintNodeJoinPrimaryNetworkOutput(nodeID ids.NodeID, weight uint64, network models.Network, start time.Time) {
 	ux.Logger.PrintToUser("NodeID: %s", nodeID.String())
-	ux.Logger.PrintToUser("Network: %s", network.Kind.String())
+	ux.Logger.PrintToUser("Network: %s", network.Name())
 	ux.Logger.PrintToUser("Start time: %s", start.Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("End time: %s", start.Add(duration).Format(constants.TimeParseLayout))
 	// we need to divide by 10 ^ 9 since we were using nanoAvax

cmd/subnetcmd/addDelegator.go

@@ -96,7 +96,7 @@ func addPermissionlessDelegator(_ *cobra.Command, args []string) error {
 	if useLedger && keyName != "" {
 		return ErrMutuallyExlusiveKeyLedger
 	}
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if os.Getenv(constants.SimulatePublicNetwork) != "" {
 		subnetID = sc.Networks[models.Local.String()].SubnetID
 	}
@@ -161,7 +161,7 @@ func printAddPermissionlessDelOutput(txID ids.ID, nodeID ids.NodeID, network mod
 	ux.Logger.PrintToUser("Node successfully added as delegator!")
 	ux.Logger.PrintToUser("TX ID: %s", txID.String())
 	ux.Logger.PrintToUser("NodeID: %s", nodeID.String())
-	ux.Logger.PrintToUser("Network: %s", network.Kind.String())
+	ux.Logger.PrintToUser("Network: %s", network.Name())
 	ux.Logger.PrintToUser("Start time: %s", start.UTC().Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("End time: %s", endTime.Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("Stake Amount: %d", stakedTokenAmount)
@@ -180,10 +180,10 @@ func handleAddPermissionlessDelegatorLocal(subnetName string, network models.Net
 	}
 	ux.Logger.PrintToUser("Inputs complete, issuing transaction addPermissionlessDelegatorTx...")
 	ux.Logger.PrintToUser("")
-	assetID := sc.ElasticSubnet[network.Kind.String()].AssetID
+	assetID := sc.ElasticSubnet[network.Name()].AssetID
 	testKey := genesis.EWOQKey
 	keyChain := secp256k1fx.NewKeychain(testKey)
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	txID, err := subnet.IssueAddPermissionlessDelegatorTx(keyChain, subnetID, nodeID, stakedTokenAmount, assetID, uint64(start.Unix()), uint64(endTime.Unix()))
 	if err != nil {
 		return err

cmd/subnetcmd/addValidator.go

@@ -146,7 +146,7 @@ func addValidator(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}
@@ -202,7 +202,7 @@ func addValidator(_ *cobra.Command, args []string) error {
 	}
 
 	ux.Logger.PrintToUser("NodeID: %s", nodeID.String())
-	ux.Logger.PrintToUser("Network: %s", network.Kind.String())
+	ux.Logger.PrintToUser("Network: %s", network.Name())
 	ux.Logger.PrintToUser("Start time: %s", start.Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("End time: %s", start.Add(duration).Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("Weight: %d", weight)

cmd/subnetcmd/deploy.go

@@ -277,7 +277,7 @@ func deploySubnet(cmd *cobra.Command, args []string) error {
 	}
 
 	// deploy based on chosen network
-	ux.Logger.PrintToUser("Deploying %s to %s", chains, network.Kind.String())
+	ux.Logger.PrintToUser("Deploying %s to %s", chains, network.Name())
 	chainGenesis, err := app.LoadRawGenesis(chain, network)
 	if err != nil {
 		return err
@@ -350,7 +350,7 @@ func deploySubnet(cmd *cobra.Command, args []string) error {
 			return err
 		}
 		flags := make(map[string]string)
-		flags[constants.Network] = network.Kind.String()
+		flags[constants.Network] = network.Name()
 		utils.HandleTracking(cmd, app, flags)
 		return app.UpdateSidecarNetworks(&sidecar, network, subnetID, blockchainID)
 
@@ -395,7 +395,7 @@ func deploySubnet(cmd *cobra.Command, args []string) error {
 		}
 		createSubnet = false
 	} else if sidecar.Networks != nil {
-		model, ok := sidecar.Networks[network.Kind.String()]
+		model, ok := sidecar.Networks[network.Name()]
 		if ok {
 			if model.SubnetID != ids.Empty && model.BlockchainID == ids.Empty {
 				subnetID = model.SubnetID
@@ -514,7 +514,7 @@ func deploySubnet(cmd *cobra.Command, args []string) error {
 	}
 
 	flags := make(map[string]string)
-	flags[constants.Network] = network.Kind.String()
+	flags[constants.Network] = network.Name()
 	utils.HandleTracking(cmd, app, flags)
 
 	// update sidecar

cmd/subnetcmd/elastic.go

@@ -232,7 +232,7 @@ func transformElasticSubnet(cmd *cobra.Command, args []string) error {
 		return ErrMutuallyExlusiveKeyLedger
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if os.Getenv(constants.SimulatePublicNetwork) != "" {
 		subnetID = sc.Networks[models.Local.String()].SubnetID
 	}
@@ -394,7 +394,7 @@ func transformElasticSubnet(cmd *cobra.Command, args []string) error {
 		return err
 	}
 	flags := make(map[string]string)
-	flags[constants.Network] = network.Kind.String()
+	flags[constants.Network] = network.Name()
 	if !isFullySigned {
 		flags[constants.MultiSig] = "multi-sig"
 	} else {
@@ -727,8 +727,8 @@ func checkIfTxHasOccurred(
 	if sc.ElasticSubnet == nil {
 		return false, ids.Empty
 	}
-	if sc.ElasticSubnet[network.Kind.String()].Txs != nil {
-		txID, ok := sc.ElasticSubnet[network.Kind.String()].Txs[txName]
+	if sc.ElasticSubnet[network.Name()].Txs != nil {
+		txID, ok := sc.ElasticSubnet[network.Name()].Txs[txName]
 		if ok {
 			return true, txID
 		}

cmd/subnetcmd/import_from_api.go

@@ -142,7 +142,7 @@ func importRunningSubnet(*cobra.Command, []string) error {
 	defer cancel()
 	options := []rpc.Option{}
 
-	ux.Logger.PrintToUser("Getting information from the %s network...", network.Kind.String())
+	ux.Logger.PrintToUser("Getting information from the %s network...", network.Name())
 
 	txBytes, err := client.GetTx(ctx, blockchainID, options...)
 	if err != nil {
@@ -205,7 +205,7 @@ func importRunningSubnet(*cobra.Command, []string) error {
 		Name: subnetName,
 		VM:   vmType,
 		Networks: map[string]models.NetworkData{
-			network.Kind.String(): {
+			network.Name(): {
 				SubnetID:     subnetID,
 				BlockchainID: blockchainID,
 			},

cmd/subnetcmd/join.go

@@ -160,7 +160,7 @@ func joinCmd(_ *cobra.Command, args []string) error {
 		network = models.LocalNetwork
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}
@@ -316,12 +316,12 @@ func writeAvagoChainConfigFiles(
 		dataDir = filepath.Join(home, ".avalanchego")
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}
 	subnetIDStr := subnetID.String()
-	blockchainID := sc.Networks[network.Kind.String()].BlockchainID
+	blockchainID := sc.Networks[network.Name()].BlockchainID
 	if blockchainID == ids.Empty {
 		return errNoBlockchainID
 	}
@@ -390,7 +390,7 @@ func handleValidatorJoinElasticSubnet(sc models.Sidecar, network models.Network,
 		return ErrMutuallyExlusiveKeyLedger
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if os.Getenv(constants.SimulatePublicNetwork) != "" {
 		subnetID = sc.Networks[models.Local.String()].SubnetID
 	}
@@ -473,7 +473,7 @@ func printAddPermissionlessValOutput(txID ids.ID, nodeID ids.NodeID, network mod
 	ux.Logger.PrintToUser("Validator successfully joined elastic subnet!")
 	ux.Logger.PrintToUser("TX ID: %s", txID.String())
 	ux.Logger.PrintToUser("NodeID: %s", nodeID.String())
-	ux.Logger.PrintToUser("Network: %s", network.Kind.String())
+	ux.Logger.PrintToUser("Network: %s", network.Name())
 	ux.Logger.PrintToUser("Start time: %s", start.UTC().Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("End time: %s", endTime.Format(constants.TimeParseLayout))
 	ux.Logger.PrintToUser("Stake Amount: %d", stakedTokenAmount)

cmd/subnetcmd/removeValidator.go

@@ -128,7 +128,7 @@ func removeValidator(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}
@@ -180,7 +180,7 @@ func removeValidator(_ *cobra.Command, args []string) error {
 	}
 
 	ux.Logger.PrintToUser("NodeID: %s", nodeID.String())
-	ux.Logger.PrintToUser("Network: %s", network.Kind.String())
+	ux.Logger.PrintToUser("Network: %s", network.Name())
 	ux.Logger.PrintToUser("Inputs complete, issuing transaction to remove the specified validator...")
 
 	deployer := subnet.NewPublicDeployer(app, useLedger, kc, network)

cmd/subnetcmd/stats.go

@@ -75,7 +75,7 @@ func stats(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errors.New("no subnetID found for the provided subnet name; has this subnet actually been deployed to this network?")
 	}

cmd/subnetcmd/validators.go

@@ -75,7 +75,7 @@ func printValidators(_ *cobra.Command, args []string) error {
 		return err
 	}
 
-	deployInfo, ok := sc.Networks[network.Kind.String()]
+	deployInfo, ok := sc.Networks[network.Name()]
 	if !ok {
 		return errors.New("no deployment found for subnet")
 	}

cmd/transactioncmd/transaction_commit.go

@@ -52,7 +52,7 @@ func commitTx(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}

cmd/transactioncmd/transaction_sign.go

@@ -94,7 +94,7 @@ func signTx(_ *cobra.Command, args []string) error {
 	if err != nil {
 		return err
 	}
-	subnetID := sc.Networks[network.Kind.String()].SubnetID
+	subnetID := sc.Networks[network.Name()].SubnetID
 	if subnetID == ids.Empty {
 		return errNoSubnetID
 	}

pkg/application/app.go

@@ -483,7 +483,7 @@ func (app *Avalanche) UpdateSidecarNetworks(
 	if sc.Networks == nil {
 		sc.Networks = make(map[string]models.NetworkData)
 	}
-	sc.Networks[network.Kind.String()] = models.NetworkData{
+	sc.Networks[network.Name()] = models.NetworkData{
 		SubnetID:     subnetID,
 		BlockchainID: blockchainID,
 		RPCVersion:   sc.RPCVersion,
@@ -506,8 +506,8 @@ func (app *Avalanche) UpdateSidecarElasticSubnet(
 	if sc.ElasticSubnet == nil {
 		sc.ElasticSubnet = make(map[string]models.ElasticSubnet)
 	}
-	partialTxs := sc.ElasticSubnet[network.Kind.String()].Txs
-	sc.ElasticSubnet[network.Kind.String()] = models.ElasticSubnet{
+	partialTxs := sc.ElasticSubnet[network.Name()].Txs
+	sc.ElasticSubnet[network.Name()] = models.ElasticSubnet{
 		SubnetID:    subnetID,
 		AssetID:     assetID,
 		PChainTXID:  pchainTXID,
@@ -527,12 +527,12 @@ func (app *Avalanche) UpdateSidecarPermissionlessValidator(
 	nodeID string,
 	txID ids.ID,
 ) error {
-	elasticSubnet := sc.ElasticSubnet[network.Kind.String()]
+	elasticSubnet := sc.ElasticSubnet[network.Name()]
 	if elasticSubnet.Validators == nil {
 		elasticSubnet.Validators = make(map[string]models.PermissionlessValidators)
 	}
 	elasticSubnet.Validators[nodeID] = models.PermissionlessValidators{TxID: txID}
-	sc.ElasticSubnet[network.Kind.String()] = elasticSubnet
+	sc.ElasticSubnet[network.Name()] = elasticSubnet
 	if err := app.UpdateSidecar(sc); err != nil {
 		return err
 	}
@@ -549,11 +549,11 @@ func (app *Avalanche) UpdateSidecarElasticSubnetPartialTx(
 		sc.ElasticSubnet = make(map[string]models.ElasticSubnet)
 	}
 	partialTxs := make(map[string]ids.ID)
-	if sc.ElasticSubnet[network.Kind.String()].Txs != nil {
-		partialTxs = sc.ElasticSubnet[network.Kind.String()].Txs
+	if sc.ElasticSubnet[network.Name()].Txs != nil {
+		partialTxs = sc.ElasticSubnet[network.Name()].Txs
 	}
 	partialTxs[txName] = txID
-	sc.ElasticSubnet[network.Kind.String()] = models.ElasticSubnet{
+	sc.ElasticSubnet[network.Name()] = models.ElasticSubnet{
 		Txs: partialTxs,
 	}
 	return app.UpdateSidecar(sc)

pkg/models/network.go

@@ -3,6 +3,8 @@
 package models
 
 import (
+	"fmt"
+
 	"github.com/ava-labs/avalanche-cli/pkg/constants"
 	avago_constants "github.com/ava-labs/avalanchego/utils/constants"
 )
@@ -17,8 +19,8 @@ const (
 	Devnet
 )
 
-func (s NetworkKind) String() string {
-	switch s {
+func (nk NetworkKind) String() string {
+	switch nk {
 	case Mainnet:
 		return "Mainnet"
 	case Fuji:
@@ -80,3 +82,11 @@ func NetworkFromNetworkID(networkID uint32) Network {
 	}
 	return UndefinedNetwork
 }
+
+func (n Network) Name() string {
+	return n.Kind.String()
+}
+
+func (n Network) CChainEndpoint() string {
+	return fmt.Sprintf("%s/ext/bc/%s/rpc", n.Endpoint, "C")
+}

tests/e2e/utils/helpers.go

@@ -193,7 +193,7 @@ func AddSubnetIDToSidecar(subnetName string, network models.Network, subnetID st
 	if err != nil {
 		return err
 	}
-	sc.Networks[network.Kind.String()] = models.NetworkData{
+	sc.Networks[network.Name()] = models.NetworkData{
 		SubnetID: subnetIDstr,
 	}