fixup: Respond to review feedback

Author: maru-ava

config/viper.go

@@ -15,6 +15,10 @@ import (
 	"github.com/spf13/viper"
 )
 
+const EnvPrefix = "avago"
+
+var DashesToUnderscores = strings.NewReplacer("-", "_")
+
 // BuildViper returns the viper environment from parsing config file from
 // default search paths and any parsed command line flags
 func BuildViper(fs *pflag.FlagSet, args []string) (*viper.Viper, error) {
@@ -27,8 +31,8 @@ func BuildViper(fs *pflag.FlagSet, args []string) (*viper.Viper, error) {
 
 	v := viper.New()
 	v.AutomaticEnv()
-	v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
-	v.SetEnvPrefix("avago")
+	v.SetEnvKeyReplacer(DashesToUnderscores)
+	v.SetEnvPrefix(EnvPrefix)
 	if err := v.BindPFlags(fs); err != nil {
 		return nil, err
 	}

tests/antithesis/avalanchego/config.go

@@ -6,11 +6,11 @@ package main
 import (
 	"errors"
 	"fmt"
-	"strings"
 
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
 
+	"github.com/ava-labs/avalanchego/config"
 	"github.com/ava-labs/avalanchego/wallet/subnet/primary"
 )
 
@@ -62,7 +62,7 @@ func parseFlags(arguments []string) (*viper.Viper, error) {
 
 	v := viper.New()
 	v.AutomaticEnv()
-	v.SetEnvKeyReplacer(strings.NewReplacer("-", "_"))
+	v.SetEnvKeyReplacer(config.DashesToUnderscores)
 	v.SetEnvPrefix(EnvPrefix)
 	if err := v.BindPFlags(fs); err != nil {
 		return nil, fmt.Errorf("failed binding pflags: %w", err)

tests/antithesis/avalanchego/gencomposeconfig/main.go

@@ -29,7 +29,7 @@ func main() {
 	nodeImageName := fmt.Sprintf("%s-node:%s", baseImageName, imageTag)
 	workloadImageName := fmt.Sprintf("%s-workload:%s", baseImageName, imageTag)
 
-	network := tmpnet.LocalNetworkOrDie()
+	network := tmpnet.LocalNetworkOrPanic()
 	err := antithesis.GenerateComposeConfig(network, nodeImageName, workloadImageName, targetPath)
 	if err != nil {
 		log.Fatalf("failed to generate config for docker-compose: %s", err)

tests/antithesis/compose.go

@@ -183,7 +183,7 @@ func keyMapToEnvVarMap(keyMap types.Mapping) types.Mapping {
 	envVarMap := make(types.Mapping, len(keyMap))
 	for key, val := range keyMap {
 		// e.g. network-id -> AVAGO_NETWORK_ID
-		envVar := "AVAGO_" + strings.ToUpper(strings.ReplaceAll(key, "-", "_"))
+		envVar := strings.ToUpper(config.EnvPrefix + "_" + config.DashesToUnderscores.Replace(key))
 		envVarMap[envVar] = val
 	}
 	return envVarMap

tests/fixture/tmpnet/local_network.go

@@ -11,7 +11,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/crypto/secp256k1"
 )
 
-func LocalNetworkOrDie() *Network {
+func LocalNetworkOrPanic() *Network {
 	// Temporary network configured with local network keys
 	// See: /staking/local/README.md
 	network := &Network{