luxfi/netrunner
1
0
Fork 0
mirror of https://github.com/luxfi/netrunner.git synced 2026-07-27 00:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix broken chain config (#97)

Browse Source 
* fix broken chain config

* fix issue #96

* put c-chain config file at correct path

* rename field

Co-authored-by: Fabio Barone <holistic.computing@gmail.com>
This commit is contained in:
Dan Laine
2022-02-17 09:25:39 -05:00
committed by GitHub
co-authored by Fabio Barone
parent f8d1c7a8be
commit e50ade140f
2 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
local/network.go
+28 -20
View File
@@ -46,6 +46,8 @@ var (
config.BootstrapIPsKey: {},
config.BootstrapIDsKey: {},
}
chainConfigSubDir = "chainConfigs"
cChainConfigSubDir = filepath.Join(chainConfigSubDir, "C")
)
// network keeps information uses for network management, and accessing all the nodes
@@ -787,45 +789,51 @@ func (ln *localNetwork) buildFlags(
// It returns flags used to point to those files.
func writeFiles(genesis []byte, nodeRootDir string, nodeConfig *node.Config) ([]string, error) {
type file struct {
path string
pathKey string
val []byte
pathKey string
flagValue string
path string
contents []byte
}
files := []file{
{
path: filepath.Join(nodeRootDir, stakingKeyFileName),
pathKey: config.StakingKeyPathKey,
val: []byte(nodeConfig.StakingKey),
flagValue: filepath.Join(nodeRootDir, stakingKeyFileName),
path: filepath.Join(nodeRootDir, stakingKeyFileName),
pathKey: config.StakingKeyPathKey,
contents: []byte(nodeConfig.StakingKey),
},
{
path: filepath.Join(nodeRootDir, stakingCertFileName),
pathKey: config.StakingCertPathKey,
val: []byte(nodeConfig.StakingCert),
flagValue: filepath.Join(nodeRootDir, stakingCertFileName),
path: filepath.Join(nodeRootDir, stakingCertFileName),
pathKey: config.StakingCertPathKey,
contents: []byte(nodeConfig.StakingCert),
},
{
path: filepath.Join(nodeRootDir, genesisFileName),
pathKey: config.GenesisConfigFileKey,
val: genesis,
flagValue: filepath.Join(nodeRootDir, genesisFileName),
path: filepath.Join(nodeRootDir, genesisFileName),
pathKey: config.GenesisConfigFileKey,
contents: genesis,
},
}
if len(nodeConfig.ConfigFile) != 0 {
files = append(files, file{
path: filepath.Join(nodeRootDir, configFileName),
pathKey: config.ConfigFileKey,
val: []byte(nodeConfig.ConfigFile),
flagValue: filepath.Join(nodeRootDir, configFileName),
path: filepath.Join(nodeRootDir, configFileName),
pathKey: config.ConfigFileKey,
contents: []byte(nodeConfig.ConfigFile),
})
}
if len(nodeConfig.CChainConfigFile) != 0 {
files = append(files, file{
path: filepath.Join(nodeRootDir, "C", configFileName),
pathKey: config.ChainConfigDirKey,
val: []byte(nodeConfig.CChainConfigFile),
flagValue: filepath.Join(nodeRootDir, chainConfigSubDir),
path: filepath.Join(nodeRootDir, cChainConfigSubDir, configFileName),
pathKey: config.ChainConfigDirKey,
contents: []byte(nodeConfig.CChainConfigFile),
})
}
flags := []string{}
for _, f := range files {
flags = append(flags, fmt.Sprintf("--%s=%s", f.pathKey, f.path))
if err := createFileAndWrite(f.path, f.val); err != nil {
flags = append(flags, fmt.Sprintf("--%s=%s", f.pathKey, f.flagValue))
if err := createFileAndWrite(f.path, f.contents); err != nil {
return nil, fmt.Errorf("couldn't write file at %q: %w", f.path, err)
}
}
local/network_test.go
+4 -3
View File
@@ -1101,8 +1101,9 @@ func TestWriteFiles(t *testing.T) {
genesisFlag := fmt.Sprintf("--%s=%v", config.GenesisConfigFileKey, genesisPath)
configFilePath := filepath.Join(tmpDir, configFileName)
configFileFlag := fmt.Sprintf("--%s=%v", config.ConfigFileKey, configFilePath)
cChainConfigPath := filepath.Join(tmpDir, "C", configFileName)
cChainConfigFileFlag := fmt.Sprintf("--%s=%v", config.ChainConfigDirKey, cChainConfigPath)
chainConfigDir := filepath.Join(tmpDir, chainConfigSubDir)
cChainConfigPath := filepath.Join(tmpDir, chainConfigSubDir, "C", configFileName)
chainConfigDirFlag := fmt.Sprintf("--%s=%v", config.ChainConfigDirKey, chainConfigDir)
type test struct {
name string
@@ -1158,7 +1159,7 @@ func TestWriteFiles(t *testing.T) {
stakingCertFlag,
genesisFlag,
configFileFlag,
cChainConfigFileFlag,
chainConfigDirFlag,
},
},
}