Inline fields in QueryCodeInfoResponse

CosmWasm · Aug 5, 2024 · 03777d7 · 03777d7
1 parent 54d3ead
commit 03777d7
Show file tree

Hide file tree

Showing 6 changed files with 258 additions and 131 deletions.
diff --git a/docs/proto/proto-docs.md b/docs/proto/proto-docs.md
@@ -1091,7 +1091,10 @@ QueryCodeInfoResponse is the response type for the Query/Code RPC method
 
 | Field | Type | Label | Description |
 | ----- | ---- | ----- | ----------- |
-| `code_info` | [CodeInfoResponse](#cosmwasm.wasm.v1.CodeInfoResponse) |  |  |
+| `code_id` | [uint64](#uint64) |  |  |
+| `creator` | [string](#string) |  |  |
+| `checksum` | [bytes](#bytes) |  |  |
+| `instantiate_permission` | [AccessConfig](#cosmwasm.wasm.v1.AccessConfig) |  |  |
 
 
 

diff --git a/proto/cosmwasm/wasm/v1/query.proto b/proto/cosmwasm/wasm/v1/query.proto
@@ -225,8 +225,13 @@ message QueryCodeInfoRequest {
 // QueryCodeInfoResponse is the response type for the Query/Code RPC method
 message QueryCodeInfoResponse {
   option (gogoproto.equal) = true;
-  CodeInfoResponse code_info = 1
-      [ (gogoproto.embed) = true, (gogoproto.jsontag) = "" ];
+
+  uint64 code_id = 1 [ (gogoproto.customname) = "CodeID" ];
+  string creator = 2 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+  bytes checksum = 3 [ (gogoproto.casttype) =
+                           "github.com/cometbft/cometbft/libs/bytes.HexBytes" ];
+  AccessConfig instantiate_permission = 4
+      [ (gogoproto.nullable) = false, (amino.dont_omitempty) = true ];
 }
 
 // CodeInfoResponse contains code meta data from CodeInfo

diff --git a/x/wasm/client/cli/query.go b/x/wasm/client/cli/query.go
@@ -261,11 +261,8 @@ func GetCmdQueryCodeInfo() *cobra.Command {
 			if err != nil {
 				return err
 			}
-			if res.CodeInfoResponse == nil {
-				return fmt.Errorf("code not found")
-			}
 
-			return clientCtx.PrintProto(res.CodeInfoResponse)
+			return clientCtx.PrintProto(res)
 		},
 		SilenceUsage: true,
 	}

diff --git a/x/wasm/keeper/querier.go b/x/wasm/keeper/querier.go
@@ -297,7 +297,10 @@ func (q GrpcQuerier) CodeInfo(c context.Context, req *types.QueryCodeInfoRequest
 		return nil, types.ErrNoSuchCodeFn(req.CodeId).Wrapf("code id %d", req.CodeId)
 	}
 	return &types.QueryCodeInfoResponse{
-		CodeInfoResponse: info,
+		CodeID:                info.CodeID,
+		Creator:               info.Creator,
+		Checksum:              info.DataHash,
+		InstantiatePermission: info.InstantiatePermission,
 	}, nil
 }
 

diff --git a/x/wasm/keeper/querier_test.go b/x/wasm/keeper/querier_test.go
@@ -815,12 +815,10 @@ func TestQueryCodeInfo(t *testing.T) {
 			})
 			require.NoError(t, err)
 			expectedResponse := &types.QueryCodeInfoResponse{
-				CodeInfoResponse: &types.CodeInfoResponse{
-					CodeID:                spec.codeID,
-					Creator:               codeInfo.Creator,
-					DataHash:              codeInfo.CodeHash,
-					InstantiatePermission: spec.accessConfig,
-				},
+				CodeID:                spec.codeID,
+				Creator:               codeInfo.Creator,
+				Checksum:              codeInfo.CodeHash,
+				InstantiatePermission: spec.accessConfig,
 			}
 			require.NotNil(t, got)
 			require.EqualValues(t, expectedResponse, got)