fix lint and improve readbility

Author: Pantani

ignite/config/chain/parse.go

@@ -196,36 +196,11 @@ func handleIncludes(cfg *Config) error {
 
 	for _, includePath := range cfg.Include {
 		if u, err := url.ParseRequestURI(includePath); err == nil && u.Scheme != "" {
-			// Download file from URL to temp file
-			tmpFile, err := os.CreateTemp("", "config-*.yml")
+			includePath, err = fetchConfigFile(includePath)
 			if err != nil {
-				return errors.Wrapf(err, "failed to create temp file for URL")
+				return errors.Wrapf(err, "failed to fetch included config file '%s'", includePath)
 			}
-			defer func() {
-				tmpFile.Close()
-				os.Remove(tmpFile.Name())
-			}()
-
-			client := &http.Client{Timeout: 30 * time.Second}
-			resp, err := client.Get(includePath)
-			if err != nil {
-				return errors.Wrapf(err, "failed to download from URL '%s'", includePath)
-			}
-			defer resp.Body.Close()
-
-			if resp.StatusCode != http.StatusOK {
-				return errors.Errorf("failed to download file, status code: %d", resp.StatusCode)
-			}
-
-			if _, err = io.Copy(tmpFile, resp.Body); err != nil {
-				return errors.Wrapf(err, "failed to save downloaded file from '%s'", includePath)
-			}
-
-			if _, err = tmpFile.Seek(0, io.SeekStart); err != nil {
-				return errors.Wrapf(err, "failed to rewind temp file from '%s'", includePath)
-			}
-
-			includePath = tmpFile.Name()
+			defer os.Remove(includePath)
 		}
 
 		// Resolve path - if relative, use base directory
@@ -246,11 +221,45 @@ func handleIncludes(cfg *Config) error {
 			return errors.Wrapf(err, "failed to parse included config file '%s'", includePath)
 		}
 
+		if cfg.Version != includeCfg.Version {
+			return errors.Errorf("included config version '%d' does not match with chain config version '%d'", includeCfg.Version, cfg.Version)
+		}
+
 		// Merge the included config with the primary config
-		if err = mergo.Merge(cfg, includeCfg, mergo.WithOverride); err != nil {
+		if err = mergo.Merge(cfg, includeCfg, mergo.WithAppendSlice, mergo.WithOverride); err != nil {
 			return errors.Wrapf(err, "failed to merge included file '%s'", includePath)
 		}
 	}
 
 	return nil
 }
+
+func fetchConfigFile(URL string) (string, error) {
+	// Download file from URL to temp file
+	tmpFile, err := os.CreateTemp("", "config-*.yml")
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to create temp file for URL")
+	}
+	defer tmpFile.Close()
+
+	client := &http.Client{Timeout: 30 * time.Second}
+	resp, err := client.Get(URL)
+	if err != nil {
+		return "", errors.Wrapf(err, "failed to download from URL '%s'", URL)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return "", errors.Errorf("failed to download file, status code: %d", resp.StatusCode)
+	}
+
+	if _, err = io.Copy(tmpFile, resp.Body); err != nil {
+		return "", errors.Wrapf(err, "failed to save downloaded file from '%s'", URL)
+	}
+
+	if _, err = tmpFile.Seek(0, io.SeekStart); err != nil {
+		return "", errors.Wrapf(err, "failed to rewind temp file from '%s'", URL)
+	}
+
+	return tmpFile.Name(), nil
+}

ignite/config/chain/parse_test.go

@@ -122,6 +122,7 @@ func TestHandleIncludes(t *testing.T) {
 		{
 			name: "Single valid include",
 			baseConfig: `
+version: 1
 client:
   typescript:
     path: original
@@ -160,6 +161,7 @@ validators:
 		{
 			name: "Multiple valid includes",
 			baseConfig: `
+version: 1
 client:
   typescript:
     path: original
@@ -177,6 +179,10 @@ build:
     proto:
         path: proto
 accounts:
+    - name: bob
+      coins:
+        - 10000token
+        - 100000000stake
     - name: alice
       coins:
         - 20000token
@@ -186,19 +192,24 @@ faucet:
     coins:
         - 5token
         - 100000stake
+        - 5token
+        - 100000stake
     host: 0.0.0.0:4500
 client:
     typescript:
         path: override-2
     openapi:
         path: docs/static/include2.yml
 validators:
+    - name: alice
+      bonded: 100000000stake
     - name: validator1
       bonded: 100000000stake`,
 		},
 		{
 			name: "Invalid include file path",
 			baseConfig: `
+version: 1
 client:
   typescript:
     path: original
@@ -209,8 +220,8 @@ include:
 		{
 			name: "Empty include list",
 			baseConfig: `
-validation: sovereign
 version: 1
+validation: sovereign
 accounts:
   - name: alice
     coins:
@@ -255,6 +266,7 @@ validators:
 		{
 			name: "Empty values include",
 			baseConfig: `
+version: 1
 include:
   - "./testdata/include1.yml"
   - "./testdata/include2.yml"
@@ -269,6 +281,10 @@ build:
     proto:
         path: proto
 accounts:
+    - name: bob
+      coins:
+        - 10000token
+        - 100000000stake
     - name: alice
       coins:
         - 20000token
@@ -278,21 +294,25 @@ faucet:
     coins:
         - 5token
         - 100000stake
+        - 5token
+        - 100000stake
     host: 0.0.0.0:4500
 client:
     typescript:
         path: override-2
     openapi:
         path: docs/static/include2.yml
 validators:
+    - name: alice
+      bonded: 100000000stake
     - name: validator1
       bonded: 100000000stake`,
 		},
 		{
 			name: "HTTP include",
 			baseConfig: fmt.Sprintf(`
-validation: sovereign
 version: 1
+validation: sovereign
 accounts:
   - name: alice
     coins:
@@ -323,13 +343,23 @@ build:
     proto:
         path: proto
 accounts:
+    - name: alice
+      coins:
+        - 10000token
+    - name: bob
+      coins:
+        - 10000token
+        - 100000000stake
     - name: alice
       coins:
         - 20000token
         - 200000000stake
 faucet:
     name: alice
     coins:
+        - 5token
+        - 5token
+        - 100000stake
         - 5token
         - 100000stake
     host: 0.0.0.0:4500
@@ -339,14 +369,18 @@ client:
     openapi:
         path: docs/static/include2.yml
 validators:
+    - name: alice
+      bonded: 100stake
+    - name: alice
+      bonded: 100000000stake
     - name: validator1
       bonded: 100000000stake`, server),
 		},
 		{
 			name: "HTTP and local include",
 			baseConfig: fmt.Sprintf(`
-validation: sovereign
 version: 1
+validation: sovereign
 accounts:
   - name: alice
     coins:
@@ -377,13 +411,23 @@ build:
     proto:
         path: proto
 accounts:
+    - name: alice
+      coins:
+        - 10000token
+    - name: bob
+      coins:
+        - 10000token
+        - 100000000stake
     - name: alice
       coins:
         - 20000token
         - 200000000stake
 faucet:
     name: alice
     coins:
+        - 5token
+        - 5token
+        - 100000stake
         - 5token
         - 100000stake
     host: 0.0.0.0:4500
@@ -393,6 +437,10 @@ client:
     openapi:
         path: docs/static/include2.yml
 validators:
+    - name: alice
+      bonded: 100stake
+    - name: alice
+      bonded: 100000000stake
     - name: validator1
       bonded: 100000000stake`, server),
 		},