fix

tests/systemtests/README.md

@@ -25,7 +25,7 @@ Or via manual steps
 ```shell
 make build
 mkdir -p ./tests/systemtests/binaries
-cp ./build/simdv2 ./tests/systemtests/binaries/
+cp ./build/simd ./tests/systemtests/binaries/
 ```
 
 ### Manual test run

tests/systemtests/auth_test.go

@@ -476,6 +476,8 @@ func TestAuxSigner(t *testing.T) {
 }
 
 func TestTxEncodeandDecodeAndQueries(t *testing.T) {
+	t.Skip("we need to ensure this works on a v1 server")
+
 	// scenario: test tx encode and decode commands
 
 	cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)

tests/systemtests/cometbft_client_test.go

@@ -27,7 +27,12 @@ func TestQueryStatus(t *testing.T) {
 	cli := systest.NewCLIWrapper(t, systest.Sut, systest.Verbose)
 	systest.Sut.StartChain(t)
 
-	resp := cli.CustomQuery("comet", "status")
+	var resp string
+	if systest.IsV2() {
+		resp = cli.CustomQuery("comet", "status")
+	} else {
+		resp = cli.CustomQuery("status")
+	}
 
 	// make sure the output has the validator moniker.
 	assert.Contains(t, resp, "\"moniker\":\"node0\"")

tests/systemtests/go.mod

@@ -9,6 +9,11 @@ require (
 	github.com/fullstorydev/grpcurl v1.9.2
 )
 
+require (
+	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
+	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
+)
+
 require (
 	buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.36.3-20241120201313-68e42a58b301.1 // indirect
 	buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.36.3-20240130113600-88ef6483f90f.1 // indirect
@@ -34,8 +39,6 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
-	github.com/cncf/xds/go v0.0.0-20240905190251-b4127c9b8d78 // indirect
-	github.com/cockroachdb/apd/v3 v3.2.1 // indirect
 	github.com/cockroachdb/errors v1.11.3 // indirect
 	github.com/cockroachdb/fifo v0.0.0-20240816210425-c5d0cb0b6fc0 // indirect
 	github.com/cockroachdb/logtags v0.0.0-20241215232642-bb51bb14a506 // indirect
@@ -54,7 +57,7 @@ require (
 	github.com/cosmos/iavl v1.2.2 // indirect
 	github.com/cosmos/ics23/go v0.11.0 // indirect
 	github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
-	github.com/creachadair/tomledit v0.0.26 // indirect
+	github.com/creachadair/tomledit v0.0.27 // indirect
 	github.com/danieljoos/wincred v1.1.2 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect

tests/systemtests/go.sum

@@ -175,8 +175,8 @@ github.com/cosmos/ledger-cosmos-go v0.13.3 h1:7ehuBGuyIytsXbd4MP43mLeoN2LTOEnk5n
 github.com/cosmos/ledger-cosmos-go v0.13.3/go.mod h1:HENcEP+VtahZFw38HZ3+LS3Iv5XV6svsnkk9vdJtLr8=
 github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creachadair/tomledit v0.0.26 h1:MoDdgHIHZ5PctBVsAZDjxdxreWUEa9ObPKTRkk5PPwA=
-github.com/creachadair/tomledit v0.0.26/go.mod h1:SJi1OxKpMyR141tq1lzsbPtIg3j8TeVPM/ZftfieD7o=
+github.com/creachadair/tomledit v0.0.27 h1:6xOpEnkKmcpT/gmKhabN0JXrqNX065lyje1/mXTSSIE=
+github.com/creachadair/tomledit v0.0.27/go.mod h1:v1EWpgCisD3ct1kO8Gq4o4pdgX5JXD0rBI2PJ4UnPoA=
 github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0=

tests/systemtests/group_test.go

@@ -63,9 +63,15 @@ func TestGroupCommands(t *testing.T) {
 		rsp = cli.RunAndWait(policyCmd...)
 		systest.RequireTxSuccess(t, rsp)
 
-		groupPoliciesResp := string(systest.GetRequest(t, fmt.Sprintf("%s/cosmos/group/v1/group_policies_by_group/%s", baseurl, groupId)))
-		policyAddrQuery := fmt.Sprintf("group_policies.#(decision_policy.threshold==%d).address", threshold)
-
+		// TODO: remove isV2() check once v2 is integrated with grpc gateway
+		var groupPoliciesResp, policyAddrQuery string
+		if systest.IsV2() {
+			groupPoliciesResp = cli.CustomQuery("q", "group", "group-policies-by-group", groupId)
+			policyAddrQuery = fmt.Sprintf("group_policies.#(decision_policy.value.threshold==%d).address", threshold)
+		} else {
+			groupPoliciesResp = string(systest.GetRequest(t, fmt.Sprintf("%s/cosmos/group/v1/group_policies_by_group/%s", baseurl, groupId)))
+			policyAddrQuery = fmt.Sprintf("group_policies.#(decision_policy.threshold==%d).address", threshold)
+		}
 		require.Equal(t, gjson.Get(groupPoliciesResp, "pagination.total").Int(), int64(threshold))
 		policyAddr := gjson.Get(groupPoliciesResp, policyAddrQuery).String()
 		require.NotEmpty(t, policyAddr)
@@ -116,7 +122,12 @@ func TestGroupCommands(t *testing.T) {
 	systest.RequireTxSuccess(t, rsp)
 
 	// query votes
-	voteResp := string(systest.GetRequest(t, fmt.Sprintf("%s/cosmos/group/v1/vote_by_proposal_voter/%s/%s", baseurl, proposalId, valAddr)))
-
+	// TODO: remove isV2() check once v2 is integrated with grpc gateway
+	var voteResp string
+	if systest.IsV2() {
+		voteResp = cli.CustomQuery("q", "group", "vote", proposalId, valAddr)
+	} else {
+		voteResp = string(systest.GetRequest(t, fmt.Sprintf("%s/cosmos/group/v1/vote_by_proposal_voter/%s/%s", baseurl, proposalId, valAddr)))
+	}
 	require.Equal(t, "VOTE_OPTION_YES", gjson.Get(voteResp, "vote.option").String())
 }

tests/systemtests/mint_test.go

@@ -74,6 +74,10 @@ func TestMintQueries(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
+			// TODO: remove below check once grpc gateway is implemented in v2
+			if systest.IsV2() {
+				return
+			}
 			resp := systest.GetRequestWithHeaders(t, tc.url, tc.headers, http.StatusOK)
 			require.JSONEq(t, tc.expOut, string(resp))
 		})

tests/systemtests/snapshots_test.go

@@ -26,9 +26,18 @@ func TestSnapshots(t *testing.T) {
 	// Stop all nodes
 	systest.Sut.StopChain()
 
+	var (
+		command         string
+		restoreableDirs []string
+	)
 	node0Dir := systest.Sut.NodeDir(0)
-	command := "store"
-	restoreableDirs := []string{fmt.Sprintf("%s/data/application.db", node0Dir), fmt.Sprintf("%s/data/ss", node0Dir)}
+	if systest.IsV2() {
+		command = "store"
+		restoreableDirs = []string{fmt.Sprintf("%s/data/application.db", node0Dir), fmt.Sprintf("%s/data/ss", node0Dir)}
+	} else {
+		command = "snapshots"
+		restoreableDirs = []string{fmt.Sprintf("%s/data/application.db", node0Dir)}
+	}
 
 	// export snapshot at height 5
 	res := cli.RunCommandWithArgs(command, "export", "--height=5", fmt.Sprintf("--home=%s", node0Dir), disabledLog)
@@ -59,7 +68,9 @@ func TestSnapshots(t *testing.T) {
 	// Remove database
 	err := os.RemoveAll(fmt.Sprintf("%s/data/application.db", node0Dir))
 	require.NoError(t, err)
-	require.NoError(t, os.RemoveAll(fmt.Sprintf("%s/data/ss", node0Dir)))
+	if systest.IsV2() {
+		require.NoError(t, os.RemoveAll(fmt.Sprintf("%s/data/ss", node0Dir)))
+	}
 
 	res = cli.RunCommandWithArgs(command, "restore", "5", "3", fmt.Sprintf("--home=%s", node0Dir), disabledLog)
 	for _, dir := range restoreableDirs {
@@ -84,7 +95,12 @@ func TestPrune(t *testing.T) {
 	node0Dir := systest.Sut.NodeDir(0)
 
 	// prune
-	command := []string{"store", "prune", "--store.keep-recent=1"}
+	var command []string
+	if systest.IsV2() {
+		command = []string{"store", "prune", "--store.keep-recent=1"}
+	} else {
+		command = []string{"prune", "everything"}
+	}
 	res := cli.RunCommandWithArgs(append(command, fmt.Sprintf("--home=%s", node0Dir), disabledLog)...)
 	require.Contains(t, res, "successfully pruned the application root multi stores")
 }

tests/systemtests/staking_test.go

@@ -42,8 +42,11 @@ func TestStakeUnstake(t *testing.T) {
 	assert.Equal(t, int64(8999999), cli.QueryBalance(account1Addr, "stake"))
 
 	// check validator has been updated
-	rsp = cli.CustomQuery("q", "comet", "block-results", gjson.Get(rsp, "height").String())
-
+	if systest.IsV2() {
+		rsp = cli.CustomQuery("q", "comet", "block-results", gjson.Get(rsp, "height").String())
+	} else {
+		rsp = cli.CustomQuery("q", "block-results", gjson.Get(rsp, "height").String())
+	}
 	validatorUpdates := gjson.Get(rsp, "validator_updates").Array()
 	assert.NotEmpty(t, validatorUpdates)
 	vpk := gjson.Get(validatorUpdates[0].String(), "pub_key_bytes").String()

tests/systemtests/unordered_tx_test.go

@@ -14,9 +14,10 @@ import (
 )
 
 func TestUnorderedTXDuplicate(t *testing.T) {
-	// TODO: remove once unordered tx handling is working in v2
-	t.Skip("The unordered tx handling is not wired in v2")
-
+	if systest.IsV2() {
+		t.Skip("The unordered tx handling is not wired in v2")
+		return
+	}
 	// 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