Skip to content

[tmpnet] s/Network.ChainConfigs/Network.PrimaryChainConfigs/ #3854

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.

Sign up for GitHub

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

Merged
maru-ava merged 1 commit into from
Mar 31, 2025
+9 −10
Merged

[tmpnet] s/Network.ChainConfigs/Network.PrimaryChainConfigs/ #3854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 6 additions & 7 deletions tests/fixture/tmpnet/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ type Network struct {
Genesis *genesis.UnparsedConfig

// Configuration for primary network chains (P, X, C)
// TODO(marun) Rename to PrimaryChainConfigs
ChainConfigs map[string]FlagsMap
PrimaryChainConfigs map[string]FlagsMap

// Default configuration to use when creating new nodes
DefaultFlags FlagsMap
Expand Down Expand Up @@ -236,15 +235,15 @@ func (n *Network) EnsureDefaultConfig(log logging.Logger, avalancheGoPath string
}

// Ensure primary chains are configured
if n.ChainConfigs == nil {
n.ChainConfigs = map[string]FlagsMap{}
if n.PrimaryChainConfigs == nil {
n.PrimaryChainConfigs = map[string]FlagsMap{}
}
defaultChainConfigs := DefaultChainConfigs()
for alias, chainConfig := range defaultChainConfigs {
if _, ok := n.ChainConfigs[alias]; !ok {
n.ChainConfigs[alias] = FlagsMap{}
if _, ok := n.PrimaryChainConfigs[alias]; !ok {
n.PrimaryChainConfigs[alias] = FlagsMap{}
}
n.ChainConfigs[alias].SetDefaults(chainConfig)
n.PrimaryChainConfigs[alias].SetDefaults(chainConfig)
}

// Ensure runtime is configured
Expand Down
6 changes: 3 additions & 3 deletions tests/fixture/tmpnet/network_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func (n *Network) readChainConfigs() error {

// Clear the map of data that may end up stale (e.g. if a given
// chain is in the map but no longer exists on disk)
n.ChainConfigs = map[string]FlagsMap{}
n.PrimaryChainConfigs = map[string]FlagsMap{}

for _, entry := range entries {
if !entry.IsDir() {
Expand All @@ -141,7 +141,7 @@ func (n *Network) readChainConfigs() error {
if err != nil {
return err
}
n.ChainConfigs[chainAlias] = chainConfig
n.PrimaryChainConfigs[chainAlias] = chainConfig
}

return nil
Expand All @@ -150,7 +150,7 @@ func (n *Network) readChainConfigs() error {
func (n *Network) writeChainConfigs() error {
baseChainConfigDir := n.GetChainConfigDir()

for chainAlias, chainConfig := range n.ChainConfigs {
for chainAlias, chainConfig := range n.PrimaryChainConfigs {
// Create the directory
chainConfigDir := filepath.Join(baseChainConfigDir, chainAlias)
if err := os.MkdirAll(chainConfigDir, perms.ReadWriteExecute); err != nil {
Expand Down