fix some logic

ava-labs · Nov 11, 2022 · fe60657 · fe60657
1 parent eca37c4
commit fe60657
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 32 deletions.
diff --git a/local/blockchain.go b/local/blockchain.go
@@ -429,7 +429,7 @@ func (ln *localNetwork) restartNodesWithWhitelistedSubnets(
 		delete(nodeConfig.Flags, config.WhitelistedSubnetsKey)
 
 		ln.log.Info("removing and adding back the node for whitelisted subnets", zap.String("node-name", nodeName))
-		if err := ln.restartNode(ctx, nodeName, "", "", nil, nil); err != nil {
+		if err := ln.restartNode(ctx, nodeName, "", "", nil, nil, nil); err != nil {
 			return err
 		}
 

diff --git a/local/helpers.go b/local/helpers.go
@@ -55,38 +55,37 @@ func writeFiles(genesis []byte, nodeRootDir string, nodeConfig *node.Config) ([]
 			return nil, fmt.Errorf("couldn't write file at %q: %w", f.path, err)
 		}
 	}
-	if nodeConfig.ChainConfigFiles != nil || nodeConfig.UpgradeConfigFiles != nil {
-		// only one flag and multiple files
-		chainConfigDir := filepath.Join(nodeRootDir, chainConfigSubDir)
-		flags = append(flags, fmt.Sprintf("--%s=%s", config.ChainConfigDirKey, chainConfigDir))
-		for chainAlias, chainConfigFile := range nodeConfig.ChainConfigFiles {
-			chainConfigPath := filepath.Join(chainConfigDir, chainAlias, configFileName)
-			if err := createFileAndWrite(chainConfigPath, []byte(chainConfigFile)); err != nil {
-				return nil, fmt.Errorf("couldn't write file at %q: %w", chainConfigPath, err)
-			}
-		}
-		for chainAlias, chainUpgradeFile := range nodeConfig.UpgradeConfigFiles {
-			chainUpgradePath := filepath.Join(chainConfigDir, chainAlias, upgradeConfigFileName)
-			if err := createFileAndWrite(chainUpgradePath, []byte(chainUpgradeFile)); err != nil {
-				return nil, fmt.Errorf("couldn't write file at %q: %w", chainUpgradePath, err)
-			}
+	// chain configs dir
+	chainConfigDir := filepath.Join(nodeRootDir, chainConfigSubDir)
+	if err := os.MkdirAll(chainConfigDir, 0o750); err != nil {
+		return nil, err
+	}
+	flags = append(flags, fmt.Sprintf("--%s=%s", config.ChainConfigDirKey, chainConfigDir))
+	// subnet configs dir
+	subnetConfigDir := filepath.Join(nodeRootDir, subnetConfigSubDir)
+	if err := os.MkdirAll(subnetConfigDir, 0o750); err != nil {
+		return nil, err
+	}
+	flags = append(flags, fmt.Sprintf("--%s=%s", config.SubnetConfigDirKey, subnetConfigDir))
+	// chain configs
+	for chainAlias, chainConfigFile := range nodeConfig.ChainConfigFiles {
+		chainConfigPath := filepath.Join(chainConfigDir, chainAlias, configFileName)
+		if err := createFileAndWrite(chainConfigPath, []byte(chainConfigFile)); err != nil {
+			return nil, fmt.Errorf("couldn't write file at %q: %w", chainConfigPath, err)
 		}
 	}
-	if nodeConfig.SubnetConfigFiles != nil {
-		subnetConfigDir := filepath.Join(nodeRootDir, subnetConfigSubDir)
-		flags = append(flags, fmt.Sprintf("--%s=%s", config.ChainConfigDirKey, chainConfigDir))
-
-		for chainAlias, chainConfigFile := range nodeConfig.ChainConfigFiles {
-			chainConfigPath := filepath.Join(chainConfigDir, chainAlias, configFileName)
-			if err := createFileAndWrite(chainConfigPath, []byte(chainConfigFile)); err != nil {
-				return nil, fmt.Errorf("couldn't write file at %q: %w", chainConfigPath, err)
-			}
+	// network upgrades
+	for chainAlias, chainUpgradeFile := range nodeConfig.UpgradeConfigFiles {
+		chainUpgradePath := filepath.Join(chainConfigDir, chainAlias, upgradeConfigFileName)
+		if err := createFileAndWrite(chainUpgradePath, []byte(chainUpgradeFile)); err != nil {
+			return nil, fmt.Errorf("couldn't write file at %q: %w", chainUpgradePath, err)
 		}
-		for chainAlias, chainUpgradeFile := range nodeConfig.UpgradeConfigFiles {
-			chainUpgradePath := filepath.Join(chainConfigDir, chainAlias, upgradeConfigFileName)
-			if err := createFileAndWrite(chainUpgradePath, []byte(chainUpgradeFile)); err != nil {
-				return nil, fmt.Errorf("couldn't write file at %q: %w", chainUpgradePath, err)
-			}
+	}
+	// subnet configs
+	for subnetID, subnetConfigFile := range nodeConfig.SubnetConfigFiles {
+		subnetConfigPath := filepath.Join(subnetConfigDir, subnetID+".json")
+		if err := createFileAndWrite(subnetConfigPath, []byte(subnetConfigFile)); err != nil {
+			return nil, fmt.Errorf("couldn't write file at %q: %w", subnetConfigPath, err)
 		}
 	}
 	return flags, nil

diff --git a/network/config.go b/network/config.go
@@ -72,6 +72,8 @@ type Config struct {
 	ChainConfigFiles map[string]string `json:"chainConfigFiles"`
 	// Upgrade config files to use per default, if not specified in node config
 	UpgradeConfigFiles map[string]string `json:"upgradeConfigFiles"`
+	// Subnet config files to use per default, if not specified in node config
+	SubnetConfigFiles map[string]string `json:"subnetConfigFiles"`
 }
 
 // Validate returns an error if this config is invalid

diff --git a/network/network.go b/network/network.go
@@ -55,8 +55,9 @@ type Network interface {
 	// Get name of available snapshots
 	GetSnapshotNames() ([]string, error)
 	// Restart a given node using the same config, optionally changing binary path,
-	// whitelisted subnets, a map of chain configs, and a map of upgrade configs
-	RestartNode(context.Context, string, string, string, map[string]string, map[string]string) error
+	// whitelisted subnets, a map of chain configs, a map of upgrade configs, and
+	// a map of subnet configs
+	RestartNode(context.Context, string, string, string, map[string]string, map[string]string, map[string]string) error
 	// Create the specified blockchains
 	CreateBlockchains(context.Context, []BlockchainSpec) error
 	// Create the given numbers of subnets

diff --git a/server/server.go b/server/server.go
@@ -804,6 +804,7 @@ func (s *server) RestartNode(ctx context.Context, req *rpcpb.RestartNodeRequest)
 		req.GetWhitelistedSubnets(),
 		req.GetChainConfigs(),
 		req.GetUpgradeConfigs(),
+		req.GetSubnetConfigs(),
 	); err != nil {
 		return nil, err
 	}