fixup: Address review feedback #1

maru-ava · maru-ava · commit bb20c3e1674f · 2023-08-08T09:40:22.000-07:00
diff --git a/config/flags.go b/config/flags.go
@@ -31,7 +31,7 @@ const (
 	AvalancheGoDataDirVar    = "AVALANCHEGO_DATA_DIR"
 	defaultUnexpandedDataDir = "$" + AvalancheGoDataDirVar
 
-	ProcessContextFilename = "process.json"
+	DefaultProcessContextFilename = "process.json"
 )
 
 var (
@@ -52,7 +52,7 @@ var (
 	defaultSubnetConfigDir      = filepath.Join(defaultConfigDir, "subnets")
 	defaultPluginDir            = filepath.Join(defaultUnexpandedDataDir, "plugins")
 	defaultChainDataDir         = filepath.Join(defaultUnexpandedDataDir, "chainData")
-	defaultProcessContextPath   = filepath.Join(defaultUnexpandedDataDir, ProcessContextFilename)
+	defaultProcessContextPath   = filepath.Join(defaultUnexpandedDataDir, DefaultProcessContextFilename)
 )
 
 func deprecateFlags(fs *pflag.FlagSet) error {
diff --git a/tests/fixture/testnet/local/network.go b/tests/fixture/testnet/local/network.go
@@ -57,6 +57,7 @@ func FindNextNetworkID(rootDir string) (uint32, string, error) {
 	for {
 		_, reserved := constants.NetworkIDToNetworkName[networkID]
 		if reserved {
+			networkID++
 			continue
 		}
 
diff --git a/tests/fixture/testnet/local/node.go b/tests/fixture/testnet/local/node.go
@@ -130,7 +130,7 @@ func (n *LocalNode) WriteConfig() error {
 }
 
 func (n *LocalNode) GetProcessContextPath() string {
-	return filepath.Join(n.GetDataDir(), config.ProcessContextFilename)
+	return filepath.Join(n.GetDataDir(), config.DefaultProcessContextFilename)
 }
 
 func (n *LocalNode) ReadProcessContext() error {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ const (`
`31`	`31`	`AvalancheGoDataDirVar = "AVALANCHEGO_DATA_DIR"`
`32`	`32`	`defaultUnexpandedDataDir = "$" + AvalancheGoDataDirVar`
`33`	`33`
`34`		`- ProcessContextFilename = "process.json"`
	`34`	`+ DefaultProcessContextFilename = "process.json"`
`35`	`35`	`)`
`36`	`36`
`37`	`37`	`var (`
`@@ -52,7 +52,7 @@ var (`
`52`	`52`	`defaultSubnetConfigDir = filepath.Join(defaultConfigDir, "subnets")`
`53`	`53`	`defaultPluginDir = filepath.Join(defaultUnexpandedDataDir, "plugins")`
`54`	`54`	`defaultChainDataDir = filepath.Join(defaultUnexpandedDataDir, "chainData")`
`55`		`- defaultProcessContextPath = filepath.Join(defaultUnexpandedDataDir, ProcessContextFilename)`
	`55`	`+ defaultProcessContextPath = filepath.Join(defaultUnexpandedDataDir, DefaultProcessContextFilename)`
`56`	`56`	`)`
`57`	`57`
`58`	`58`	`func deprecateFlags(fs *pflag.FlagSet) error {`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ func FindNextNetworkID(rootDir string) (uint32, string, error) {`
`57`	`57`	`for {`
`58`	`58`	`_, reserved := constants.NetworkIDToNetworkName[networkID]`
`59`	`59`	`if reserved {`
	`60`	`+ networkID++`
`60`	`61`	`continue`
`61`	`62`	`}`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func (n *LocalNode) WriteConfig() error {`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`func (n *LocalNode) GetProcessContextPath() string {`
`133`		`- return filepath.Join(n.GetDataDir(), config.ProcessContextFilename)`
	`133`	`+ return filepath.Join(n.GetDataDir(), config.DefaultProcessContextFilename)`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`func (n *LocalNode) ReadProcessContext() error {`