fixup: Add ConfigMap type alias for map[string]any

Author: maru-ava

tests/fixture/subnet/xsvm.go

@@ -33,7 +33,7 @@ func NewXSVMOrPanic(name string, key *secp256k1.PrivateKey, nodes ...*tmpnet.Nod
 
 	return &tmpnet.Subnet{
 		Name: name,
-		Config: map[string]any{
+		Config: tmpnet.ConfigMap{
 			// Reducing this from the 1s default speeds up tx acceptance
 			"proposerMinBlockDelay": 0,
 		},

tests/fixture/tmpnet/network.go

@@ -79,6 +79,10 @@ func init() {
 	}
 }
 
+// Enables defining subnet and chain configuration in a format
+// appropriate for round-tripping through JSON to golang structs.
+type ConfigMap map[string]any
+
 // Collects the configuration for running a temporary avalanchego network
 type Network struct {
 	// Uniquely identifies the temporary network for metrics
@@ -107,10 +111,10 @@ type Network struct {
 	Genesis *genesis.UnparsedConfig
 
 	// Configuration for primary subnets
-	PrimarySubnetConfig map[string]any
+	PrimarySubnetConfig ConfigMap
 
 	// Configuration for primary network chains (P, X, C)
-	PrimaryChainConfigs map[string]ChainConfigMap
+	PrimaryChainConfigs map[string]ConfigMap
 
 	// Default configuration to use when creating new nodes
 	DefaultFlags         FlagsMap
@@ -229,12 +233,12 @@ func (n *Network) EnsureDefaultConfig(log logging.Logger) error {
 
 	// Ensure primary chains are configured
 	if n.PrimaryChainConfigs == nil {
-		n.PrimaryChainConfigs = map[string]ChainConfigMap{}
+		n.PrimaryChainConfigs = map[string]ConfigMap{}
 	}
 	defaultChainConfigs := DefaultChainConfigs()
 	for alias, defaultChainConfig := range defaultChainConfigs {
 		if _, ok := n.PrimaryChainConfigs[alias]; !ok {
-			n.PrimaryChainConfigs[alias] = ChainConfigMap{}
+			n.PrimaryChainConfigs[alias] = ConfigMap{}
 		}
 		primaryChainConfig := n.PrimaryChainConfigs[alias]
 		for key, value := range defaultChainConfig {
@@ -806,7 +810,7 @@ func (n *Network) GetGenesisFileContent() (string, error) {
 // GetSubnetConfigContent returns the base64-encoded and
 // JSON-marshaled map of subnetID to subnet configuration.
 func (n *Network) GetSubnetConfigContent() (string, error) {
-	subnetConfigs := map[ids.ID]map[string]any{}
+	subnetConfigs := map[ids.ID]ConfigMap{}
 
 	if len(n.PrimarySubnetConfig) > 0 {
 		subnetConfigs[constants.PrimaryNetworkID] = n.PrimarySubnetConfig

tests/fixture/tmpnet/network_config.go

@@ -150,13 +150,13 @@ func (n *Network) readConfig() error {
 
 // The subset of network fields to store in the network config file.
 type serializedNetworkConfig struct {
-	UUID                 string                    `json:"uuid,omitempty"`
-	Owner                string                    `json:"owner,omitempty"`
-	PrimarySubnetConfig  map[string]any            `json:"primarySubnetConfig,omitempty"`
-	PrimaryChainConfigs  map[string]ChainConfigMap `json:"primaryChainConfigs,omitempty"`
-	DefaultFlags         FlagsMap                  `json:"defaultFlags,omitempty"`
-	DefaultRuntimeConfig NodeRuntimeConfig         `json:"defaultRuntimeConfig,omitempty"`
-	PreFundedKeys        []*secp256k1.PrivateKey   `json:"preFundedKeys,omitempty"`
+	UUID                 string                  `json:"uuid,omitempty"`
+	Owner                string                  `json:"owner,omitempty"`
+	PrimarySubnetConfig  ConfigMap               `json:"primarySubnetConfig,omitempty"`
+	PrimaryChainConfigs  map[string]ConfigMap    `json:"primaryChainConfigs,omitempty"`
+	DefaultFlags         FlagsMap                `json:"defaultFlags,omitempty"`
+	DefaultRuntimeConfig NodeRuntimeConfig       `json:"defaultRuntimeConfig,omitempty"`
+	PreFundedKeys        []*secp256k1.PrivateKey `json:"preFundedKeys,omitempty"`
 }
 
 func (n *Network) writeNetworkConfig() error {

tests/fixture/tmpnet/network_test.go

@@ -18,7 +18,7 @@ func TestNetworkSerialization(t *testing.T) {
 
 	network := NewDefaultNetwork("testnet")
 	// Validate round-tripping of primary subnet configuration
-	network.PrimarySubnetConfig = map[string]any{
+	network.PrimarySubnetConfig = ConfigMap{
 		"validatorOnly": true,
 	}
 	require.NoError(network.EnsureDefaultConfig(logging.NoLog{}))

tests/fixture/tmpnet/subnet.go

@@ -55,7 +55,7 @@ type Subnet struct {
 	// networks (since the SubnetID will be different every time the subnet is created)
 	Name string
 
-	Config map[string]any
+	Config ConfigMap
 
 	// The ID of the transaction that created the subnet
 	SubnetID ids.ID