lint and minor refactor

Author: arturrez

local/helpers.go

@@ -79,7 +79,6 @@ func writeFiles(genesis []byte, nodeRootDir string, nodeConfig *node.Config) (ma
 	for _, f := range files {
 		if f.flagValue != "" {
 			flags[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.go

@@ -324,6 +324,9 @@ func loadDefaultNetworkFiles() (map[string]interface{}, []byte, []*utils.NodeKey
 
 // NewDefaultConfigNNodes creates a new default network config, with an arbitrary number of nodes
 func NewDefaultConfigNNodes(binaryPath string, numNodes uint32, networkID uint32) (network.Config, error) {
+	if networkID == 0 {
+		networkID = constants.DefaultNetworkID
+	}
 	flags, cChainConfig, nodeKeys, err := loadDefaultNetworkFiles()
 	if err != nil {
 		return network.Config{}, err
@@ -363,9 +366,6 @@ func NewDefaultConfigNNodes(binaryPath string, numNodes uint32, networkID uint32
 	if int(numNodes) == 1 && !utils.IsPublicNetwork(networkID) {
 		flags[config.SybilProtectionEnabledKey] = false
 	}
-	if networkID == 0 {
-		networkID = constants.DefaultNetworkID
-	}
 	cfg := network.Config{
 		NetworkID:          networkID,
 		Flags:              flags,
@@ -406,14 +406,13 @@ func (ln *localNetwork) loadConfig(ctx context.Context, networkConfig network.Co
 		if err != nil {
 			return err
 		}
-		if ln.networkID == 0 {
+		switch {
+		case ln.networkID == 0:
 			ln.networkID = genesisNetworkID
-		} else if ln.networkID != genesisNetworkID {
-			genesis, err := utils.SetGenesisNetworkID(ln.genesis, ln.networkID)
-			if err != nil {
+		case ln.networkID != genesisNetworkID:
+			if ln.genesis, err = utils.SetGenesisNetworkID(ln.genesis, ln.networkID); err != nil {
 				return fmt.Errorf("couldn't set network ID to genesis: %w", err)
 			}
-			ln.genesis = genesis
 		}
 	}
 

local/network_test.go

@@ -534,7 +534,7 @@ func TestGenerateDefaultNetwork(t *testing.T) {
 	t.Parallel()
 	require := require.New(t)
 	binaryPath := "pepito"
-	networkConfig, err := NewDefaultConfig(binaryPath)
+	networkConfig, err := NewDefaultConfig(binaryPath, 0)
 	require.NoError(err)
 	net, err := newNetwork(logging.NoLog{}, newMockAPISuccessful, &localTestSuccessfulNodeProcessCreator{}, "", "", "", false, false, false)
 	require.NoError(err)
@@ -968,7 +968,7 @@ func emptyNetworkConfig() (network.Config, error) {
 // keys and certificates.
 func testNetworkConfig(t *testing.T) network.Config {
 	require := require.New(t)
-	networkConfig, err := NewDefaultConfigNNodes("pepito", 3)
+	networkConfig, err := NewDefaultConfigNNodes("pepito", 3, 0)
 	require.NoError(err)
 	for i := 0; i < 3; i++ {
 		networkConfig.NodeConfigs[i].Name = fmt.Sprintf("node%d", i)
@@ -1235,7 +1235,7 @@ func TestWriteFiles(t *testing.T) {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
 			require := require.New(t)
-			flags, err := writeFiles(0, tt.genesis, tmpDir, &tt.nodeConfig)
+			flags, err := writeFiles(tt.genesis, tmpDir, &tt.nodeConfig)
 			if tt.shouldErr {
 				require.Error(err)
 				return

network/config.go

@@ -78,7 +78,7 @@ func (c *Config) Validate() error {
 			someNodeIsBeacon = true
 		}
 	}
-	if !utils.IsPublicNetwork(c.NetworkID) && len(c.NodeConfigs) > 0 && !someNodeIsBeacon {
+	if len(c.NodeConfigs) > 0 && !(utils.IsPublicNetwork(c.NetworkID) || someNodeIsBeacon) {
 		return errors.New("beacon nodes not given")
 	}
 	return nil