chore: fix system test for v2

.github/workflows/v2-test.yml

@@ -166,7 +166,7 @@ jobs:
       - name: system tests v2
         if: env.GIT_DIFF
         run: |
-          COSMOS_BUILD_OPTIONS=v2 make test-system
+          make test-system
       - uses: actions/upload-artifact@v4
         if: failure()
         with:

scripts/build/testing.mk

@@ -24,8 +24,8 @@ test-all: test-unit test-integration test-ledger-mock test-race
 .PHONY: test-system
 test-system: build
 	mkdir -p ./tests/systemtests/binaries/
-	cp $(BUILDDIR)/simd$(if $(findstring v2,$(COSMOS_BUILD_OPTIONS)),v2) ./tests/systemtests/binaries/
-	$(MAKE) -C tests/systemtests test
+	cp $(BUILDDIR)/simdv2 ./tests/systemtests/binaries/
+	COSMOS_BUILD_OPTIONS=v2 $(MAKE) -C tests/systemtests test
 
 
 TEST_PACKAGES=./...

tests/systemtests/tx_test.go

@@ -344,52 +344,60 @@ func TestGetTxEvents_GRPCGateway(t *testing.T) {
 		expLen    int
 	}{
 		{
-			"empty params",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs", baseURL),
-			true,
-			"query cannot be empty", 0,
+			name:      "empty params",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs", baseURL),
+			expErr:    true,
+			expErrMsg: "query cannot be empty",
+			expLen:    0,
 		},
 		{
-			"without pagination",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s", baseURL, bankMsgSendEventAction),
-			false,
-			"", 2,
+			name:      "without pagination",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s", baseURL, bankMsgSendEventAction),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    2,
 		},
 		{
-			"with pagination",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&page=%d&limit=%d", baseURL, bankMsgSendEventAction, 1, 1),
-			false,
-			"", 1,
+			name:      "with pagination",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&page=%d&limit=%d", baseURL, bankMsgSendEventAction, 1, 1),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    1,
 		},
 		{
-			"valid request: order by asc",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_ASC", baseURL, bankMsgSendEventAction, "message.module='bank'"),
-			false,
-			"", 2,
+			name:      "invalid request: invalid order by",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=invalid_order", baseURL, bankMsgSendEventAction, "message.module='bank'"),
+			expErr:    true,
+			expErrMsg: "cannot parse 'order_by'",
+			expLen:    0,
 		},
 		{
-			"valid request: order by desc",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=ORDER_BY_DESC", baseURL, bankMsgSendEventAction, "message.module='bank'"),
-			false,
-			"", 2,
+			name:      "expect pass with multiple-events",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s", baseURL, bankMsgSendEventAction, "message.module='bank'"),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    2,
 		},
 		{
-			"invalid request: invalid order by",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s&order_by=invalid_order", baseURL, bankMsgSendEventAction, "message.module='bank'"),
-			true,
-			"is not a valid tx.OrderBy", 0,
+			name:      "expect pass with escape event",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s", baseURL, "message.action%3D'/cosmos.bank.v1beta1.MsgSend'"),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    2,
 		},
 		{
-			"expect pass with multiple-events",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&query=%s", baseURL, bankMsgSendEventAction, "message.module='bank'"),
-			false,
-			"", 2,
+			name:      "valid request: order by asc",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&order_by=1", baseURL, bankMsgSendEventAction),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    2,
 		},
 		{
-			"expect pass with escape event",
-			fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s", baseURL, "message.action%3D'/cosmos.bank.v1beta1.MsgSend'"),
-			false,
-			"", 2,
+			name:      "valid request: order by desc",
+			url:       fmt.Sprintf("%s/cosmos/tx/v1beta1/txs?query=%s&order_by=2", baseURL, bankMsgSendEventAction),
+			expErr:    false,
+			expErrMsg: "",
+			expLen:    2,
 		},
 	}
 	for _, tc := range testCases {
@@ -401,7 +409,7 @@ func TestGetTxEvents_GRPCGateway(t *testing.T) {
 			} else {
 				require.NoError(t, err)
 				txs := gjson.Get(string(res), "txs").Array()
-				require.Equal(t, len(txs), tc.expLen)
+				require.Equal(t, tc.expLen, len(txs))
 			}
 		})
 	}