tests: fix broken network publish integration test

Author: jeronimoalbi

ignite/chainconfig/config/config.go

@@ -148,12 +148,12 @@ type Host struct {
 
 // BaseConfig defines a struct with the fields that are common to all config versions.
 type BaseConfig struct {
-	Version  Version                `yaml:"version"`
-	Build    Build                  `yaml:"build"`
-	Accounts []Account              `yaml:"accounts"`
-	Faucet   Faucet                 `yaml:"faucet,omitempty"`
-	Client   Client                 `yaml:"client,omitempty"`
-	Genesis  map[string]interface{} `yaml:"genesis,omitempty"`
+	Version  Version   `yaml:"version"`
+	Build    Build     `yaml:"build"`
+	Accounts []Account `yaml:"accounts"`
+	Faucet   Faucet    `yaml:"faucet,omitempty"`
+	Client   Client    `yaml:"client,omitempty"`
+	Genesis  xyaml.Map `yaml:"genesis,omitempty"`
 }
 
 // GetVersion returns the config version.

integration/app/tx_test.go

@@ -25,13 +25,13 @@ func TestSignTxWithDashedAppName(t *testing.T) {
 		env         = envtest.New(t)
 		appname     = "dashed-app-name"
 		app         = env.Scaffold(appname)
-		host        = app.RandomizeServerPorts()
+		servers     = app.RandomizeServerPorts()
 		ctx, cancel = context.WithCancel(env.Ctx())
 	)
 
-	nodeAddr, err := xurl.TCP(host.RPC)
+	nodeAddr, err := xurl.TCP(servers.RPC)
 	if err != nil {
-		t.Fatalf("cant read nodeAddr from host.RPC %v: %v", host.RPC, err)
+		t.Fatalf("cant read nodeAddr from host.RPC %v: %v", servers.RPC, err)
 	}
 
 	env.Exec("scaffold a simple list",
@@ -65,13 +65,13 @@ func TestSignTxWithDashedAppName(t *testing.T) {
 				"output", "json",
 			),
 			step.PreExec(func() error {
-				return env.IsAppServed(ctx, host)
+				return env.IsAppServed(ctx, servers.API)
 			}),
 		),
 		step.New(
 			step.Stdout(output),
 			step.PreExec(func() error {
-				err := env.IsAppServed(ctx, host)
+				err := env.IsAppServed(ctx, servers.API)
 				return err
 			}),
 			step.Exec(
@@ -116,7 +116,7 @@ func TestGetTxViaGRPCGateway(t *testing.T) {
 		env         = envtest.New(t)
 		appname     = randstr.Runes(10)
 		app         = env.Scaffold(fmt.Sprintf("github.com/test/%s", appname))
-		host        = app.RandomizeServerPorts()
+		servers     = app.RandomizeServerPorts()
 		ctx, cancel = context.WithCancel(env.Ctx())
 	)
 
@@ -148,7 +148,7 @@ func TestGetTxViaGRPCGateway(t *testing.T) {
 				"output", "json",
 			),
 			step.PreExec(func() error {
-				return env.IsAppServed(ctx, host)
+				return env.IsAppServed(ctx, servers.API)
 			}),
 		),
 		step.New(
@@ -182,7 +182,7 @@ func TestGetTxViaGRPCGateway(t *testing.T) {
 					return errors.New("expected alice and bob accounts to be created")
 				}
 
-				nodeAddr, err := xurl.TCP(host.RPC)
+				nodeAddr, err := xurl.TCP(servers.RPC)
 				if err != nil {
 					return err
 				}
@@ -219,7 +219,7 @@ func TestGetTxViaGRPCGateway(t *testing.T) {
 							return err
 						}
 
-						apiAddr, err := xurl.HTTP(host.API)
+						apiAddr, err := xurl.HTTP(servers.API)
 						if err != nil {
 							return err
 						}

integration/network/network_test.go

@@ -5,6 +5,7 @@ import (
 	"context"
 	"os"
 	"path"
+	"path/filepath"
 	"strings"
 	"testing"
 
@@ -13,14 +14,16 @@ import (
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ignite/cli/ignite/chainconfig"
 	"github.com/ignite/cli/ignite/pkg/cmdrunner/step"
 	"github.com/ignite/cli/ignite/pkg/gomodule"
 	envtest "github.com/ignite/cli/integration"
 )
 
 const (
-	spnModule  = "github.com/tendermint/spn"
-	spnRepoURL = "https://" + spnModule
+	spnModule     = "github.com/tendermint/spn"
+	spnRepoURL    = "https://" + spnModule
+	spnConfigFile = "config_2.yml"
 )
 
 func cloneSPN(t *testing.T) string {
@@ -66,27 +69,53 @@ func cloneSPN(t *testing.T) string {
 	return path
 }
 
+func migrateSPNConfig(t *testing.T, spnPath string) {
+	configPath := filepath.Join(spnPath, spnConfigFile)
+	rawCfg, err := os.ReadFile(configPath)
+	require.NoError(t, err)
+
+	version, err := chainconfig.ReadConfigVersion(bytes.NewReader(rawCfg))
+	require.NoError(t, err)
+	if version != chainconfig.LatestVersion {
+		t.Logf("migrating spn config from v%d to v%d", version, chainconfig.LatestVersion)
+
+		file, err := os.OpenFile(configPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755)
+		require.NoError(t, err)
+
+		defer file.Close()
+
+		err = chainconfig.MigrateLatest(bytes.NewReader(rawCfg), file)
+		require.NoError(t, err)
+	}
+}
+
 func TestNetworkPublish(t *testing.T) {
 	var (
 		spnPath = cloneSPN(t)
 		env     = envtest.New(t)
 		spn     = env.App(
 			spnPath,
 			envtest.AppHomePath(t.TempDir()),
-			envtest.AppConfigPath(path.Join(spnPath, "config_2.yml")),
+			envtest.AppConfigPath(path.Join(spnPath, spnConfigFile)),
 		)
-		servers = spn.Config().Host
 	)
 
 	var (
 		ctx, cancel       = context.WithTimeout(env.Ctx(), envtest.ServeTimeout)
 		isBackendAliveErr error
 	)
 
+	// Make sure that the SPN config file is at the latest version
+	migrateSPNConfig(t, spnPath)
+
+	validator := spn.Config().Validators[0]
+	servers, err := validator.GetServers()
+	require.NoError(t, err)
+
 	go func() {
 		defer cancel()
 
-		if isBackendAliveErr = env.IsAppServed(ctx, servers); isBackendAliveErr != nil {
+		if isBackendAliveErr = env.IsAppServed(ctx, servers.API.Address); isBackendAliveErr != nil {
 			return
 		}
 		var b bytes.Buffer