refactor: simplified further

Author: srdtrk

e2e/interchaintest/types/contract.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"context"
+	"encoding/json"
 
 	"github.com/strangelove-ventures/interchaintest/v7/chain/cosmos"
 )
@@ -25,19 +26,28 @@ func (c *Contract) Port() string {
 	return "wasm." + c.Address
 }
 
+// ExecAnyMsg executes the contract with the given exec message.
 func (c *Contract) ExecAnyMsg(ctx context.Context, callerKeyName string, execMsg string, extraExecTxArgs ...string) error {
 	_, err := c.Chain.ExecuteContract(ctx, callerKeyName, c.Address, execMsg, extraExecTxArgs...)
 	return err
 }
 
+// QueryAnyMsg queries the contract with the given query message and returns the response.
 func QueryAnyMsg[T any](ctx context.Context, c *Contract, queryMsg any) (*T, error) {
-	queryResp := QueryResponse[T]{}
+	// QueryResponse is used to represent the response of a query.
+	// It may contain different types of data, so we need to unmarshal it
+	type QueryResponse struct {
+		Response json.RawMessage `json:"data"`
+	}
+
+	queryResp := QueryResponse{}
 	err := c.Chain.QueryContract(ctx, c.Address, queryMsg, &queryResp)
 	if err != nil {
 		return nil, err
 	}
 
-	resp, err := queryResp.GetResp()
+	var resp T
+	err = json.Unmarshal(queryResp.Response, &resp)
 	if err != nil {
 		return nil, err
 	}

e2e/interchaintest/types/cosmwasm.go

@@ -20,6 +20,10 @@ import (
 	"github.com/srdtrk/cw-ica-controller/interchaintest/v2/types/icacontroller"
 )
 
+type GetCountResponse struct {
+	Count int64 `json:"count"`
+}
+
 func (s *ContractTestSuite) SetupWasmTestSuite(ctx context.Context, encoding string) uint64 {
 	wasmChainSpecs := []*interchaintest.ChainSpec{
 		chainSpecs[0],
@@ -164,7 +168,7 @@ func (s *ContractTestSuite) SendWasmMsgsTestWithEncoding(encoding string) {
 			wasmd2,
 		)
 
-		counterState, err := types.QueryAnyMsg[types.GetCountResponse](ctx, &counterContract, `{"get_count": {}}`)
+		counterState, err := types.QueryAnyMsg[GetCountResponse](ctx, &counterContract, `{"get_count": {}}`)
 		s.Require().NoError(err)
 
 		s.Require().Equal(int64(0), counterState.Count)
@@ -223,7 +227,7 @@ func (s *ContractTestSuite) SendWasmMsgsTestWithEncoding(encoding string) {
 		s.Require().Equal(uint64(2), callbackCounter.Success)
 		s.Require().Equal(uint64(0), callbackCounter.Error)
 
-		counterState, err := types.QueryAnyMsg[types.GetCountResponse](ctx, &counterContract, `{"get_count": {}}`)
+		counterState, err := types.QueryAnyMsg[GetCountResponse](ctx, &counterContract, `{"get_count": {}}`)
 		s.Require().NoError(err)
 
 		s.Require().Equal(int64(1), counterState.Count)
@@ -294,7 +298,7 @@ func (s *ContractTestSuite) SendWasmMsgsTestWithEncoding(encoding string) {
 		s.Require().Equal(uint64(3), callbackCounter.Success)
 		s.Require().Equal(uint64(0), callbackCounter.Error)
 
-		counterState, err := types.QueryAnyMsg[types.GetCountResponse](ctx, &counter2Contract, `{"get_count": {}}`)
+		counterState, err := types.QueryAnyMsg[GetCountResponse](ctx, &counter2Contract, `{"get_count": {}}`)
 		s.Require().NoError(err)
 
 		s.Require().Equal(int64(0), counterState.Count)