ci: actually enable v2 system test

.github/workflows/test.yml

@@ -145,7 +145,6 @@ jobs:
           path: ./tests/e2e-profile.out
 
   test-system:
-    needs: [tests, test-integration, test-e2e]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -177,7 +176,7 @@ jobs:
       - name: system tests v1
         if: env.GIT_DIFF
         run: |
-          COSMOS_BUILD_OPTIONS=legacy make test-system
+          make test-system
       - uses: actions/upload-artifact@v3
         if: failure()
         with:
@@ -187,7 +186,7 @@ jobs:
       - name: system tests v2
         if: env.GIT_DIFF
         run: |
-          make test-system
+          COSMOS_BUILD_OPTIONS=v2 make test-system
       - uses: actions/upload-artifact@v3
         if: failure()
         with:

Makefile

@@ -10,7 +10,7 @@ include scripts/build/build.mk
 
 .DEFAULT_GOAL := help
 
-#? go.sum: Run go mod tidy and ensure dependencies have not been modified
+#? go.sum: Run go mod tidy and ensure dependencies have not been modified.
 go.sum: go.mod
 	echo "Ensure dependencies have not been modified ..." >&2
 	go mod verify

client/grpc/cmtservice/status_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func TestStatusCommand(t *testing.T) {
-	t.Skip() // https://github.com/cosmos/cosmos-sdk/issues/17446
+	t.Skip() // Rewrite as system test
 
 	cfg, err := network.DefaultConfigWithAppConfig(depinject.Configs() /* TODO, test skipped anyway */)
 	require.NoError(t, err)

client/v2/autocli/query_test.go

@@ -575,8 +575,6 @@ func TestBinaryFlag(t *testing.T) {
 }
 
 func TestAddressValidation(t *testing.T) {
-	t.Skip() // TODO(@julienrbrt) re-able with better keyring instiantiation
-
 	fixture := initFixture(t)
 
 	_, err := runCmd(fixture, buildModuleQueryCommand,

tests/systemtests/testnet_init.go

@@ -13,6 +13,12 @@ import (
 	"github.com/creachadair/tomledit/parser"
 )
 
+// isV2 checks if the tests run with simapp v2
+func isV2() bool {
+	buildOptions := os.Getenv("COSMOS_BUILD_OPTIONS")
+	return strings.Contains(buildOptions, "v2")
+}
+
 // SingleHostTestnetCmdInitializer default testnet cmd that supports the --single-host param
 type SingleHostTestnetCmdInitializer struct {
 	execBinary        string
@@ -53,10 +59,16 @@ func (s SingleHostTestnetCmdInitializer) Initialize() {
 		"--output-dir=" + s.outputDir,
 		"--validator-count=" + strconv.Itoa(s.initialNodesCount),
 		"--keyring-backend=test",
-		"--minimum-gas-prices=" + s.minGasPrice,
 		"--commit-timeout=" + s.commitTimeout.String(),
 		"--single-host",
 	}
+
+	if isV2() {
+		args = append(args, "--server.minimum-gas-prices="+s.minGasPrice)
+	} else {
+		args = append(args, "--minimum-gas-prices="+s.minGasPrice)
+	}
+
 	s.log(fmt.Sprintf("+++ %s %s\n", s.execBinary, strings.Join(args, " ")))
 	out, err := RunShellCmd(s.execBinary, args...)
 	if err != nil {
@@ -108,7 +120,11 @@ func (s ModifyConfigYamlInitializer) Initialize() {
 		"--output-dir=" + s.outputDir,
 		"--v=" + strconv.Itoa(s.initialNodesCount),
 		"--keyring-backend=test",
-		"--minimum-gas-prices=" + s.minGasPrice,
+	}
+	if isV2() {
+		args = append(args, "--server.minimum-gas-prices="+s.minGasPrice)
+	} else {
+		args = append(args, "--minimum-gas-prices="+s.minGasPrice)
 	}
 	s.log(fmt.Sprintf("+++ %s %s\n", s.execBinary, strings.Join(args, " ")))
 
@@ -144,7 +160,6 @@ func (s ModifyConfigYamlInitializer) Initialize() {
 		EditToml(filepath.Join(nodeDir, "app.toml"), func(doc *tomledit.Document) {
 			UpdatePort(doc, apiPortStart+i, "api", "address")
 			UpdatePort(doc, grpcPortStart+i, "grpc", "address")
-			SetBool(doc, true, "grpc-web", "enable")
 		})
 	}
 }

tests/systemtests/unordered_tx_test.go

@@ -12,7 +12,8 @@ import (
 )
 
 func TestUnorderedTXDuplicate(t *testing.T) {
-	t.Skip("The unordered tx antehanlder is missing in v2")
+	t.Skip("The unordered tx handling is not wired in v2")
+
 	// scenario: test unordered tx duplicate
 	// given a running chain with a tx in the unordered tx pool
 	// when a new tx with the same hash is broadcasted

x/auth/ante/basic_test.go

@@ -99,7 +99,7 @@ func TestValidateMemo(t *testing.T) {
 }
 
 func TestConsumeGasForTxSize(t *testing.T) {
-	t.Skip() //  TODO(@julienrbrt) Fix after https://github.com/cosmos/cosmos-sdk/pull/20072
+	t.Skip() // TO FIX BEFORE 0.52 FINAL.
 
 	suite := SetupTestSuite(t, true)