updates

ignite/templates/ibc/files/oracle/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush

@@ -8,7 +8,7 @@ import (
 )
 
 // <%= queryName.UpperCamel %>Result returns the <%= queryName.UpperCamel %> result by RequestId
-func (k Keeper) <%= queryName.UpperCamel %>Result(c context.Context, req *types.Query<%= queryName.UpperCamel %>Request) (*types.Query<%= queryName.UpperCamel %>Response, error) {
+func (q queryServer) <%= queryName.UpperCamel %>Result(c context.Context, req *types.Query<%= queryName.UpperCamel %>Request) (*types.Query<%= queryName.UpperCamel %>Response, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	result, err := k.Get<%= queryName.UpperCamel %>Result(ctx, types.OracleRequestID(req.RequestId))
 	if err != nil {
@@ -18,7 +18,7 @@ func (k Keeper) <%= queryName.UpperCamel %>Result(c context.Context, req *types.
 }
 
 // Last<%= queryName.UpperCamel %>Id returns the last <%= queryName.UpperCamel %> request Id
-func (k Keeper) Last<%= queryName.UpperCamel %>Id(c context.Context, req *types.QueryLast<%= queryName.UpperCamel %>IdRequest) (*types.QueryLast<%= queryName.UpperCamel %>IdResponse, error) {
+func (q queryServer) Last<%= queryName.UpperCamel %>Id(c context.Context, req *types.QueryLast<%= queryName.UpperCamel %>IdRequest) (*types.QueryLast<%= queryName.UpperCamel %>IdResponse, error) {
 	ctx := sdk.UnwrapSDKContext(c)
 	id := k.GetLast<%= queryName.UpperCamel %>ID(ctx)
 	return &types.QueryLast<%= queryName.UpperCamel %>IdResponse{RequestId: id}, nil

ignite/templates/module/create/files/base/x/{{moduleName}}/keeper/query.go.plush

@@ -6,6 +6,8 @@ import (
 
 var _ types.QueryServer = queryServer{}
 
+// NewQueryServerImpl returns an implementation of the QueryServer interface
+// for the provided Keeper.
 func NewQueryServerImpl(k Keeper) types.QueryServer {
 	return queryServer{k}
 }

ignite/templates/query/files/x/{{moduleName}}/keeper/query_{{queryName}}.go.plush

@@ -4,12 +4,11 @@ import (
 	"context"
 
     "<%= ModulePath %>/x/<%= ModuleName %>/types"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 )
 
-func (k Keeper) <%= QueryName.UpperCamel %>(ctx context.Context,  req *types.Query<%= QueryName.UpperCamel %>Request) (*types.Query<%= QueryName.UpperCamel %>Response, error) {
+func (q queryServer) <%= QueryName.UpperCamel %>(ctx context.Context,  req *types.Query<%= QueryName.UpperCamel %>Request) (*types.Query<%= QueryName.UpperCamel %>Response, error) {
 	if req == nil {
         return nil, status.Error(codes.InvalidArgument, "invalid request")
     }

ignite/templates/typed/list/list.go

@@ -272,8 +272,8 @@ func typesKeyModify(opts *typed.Options) genny.RunFn {
 		}
 		content := f.String() + fmt.Sprintf(`
 const (
-	%[1]vKey= "%[1]v/value/"
-	%[1]vCountKey= "%[1]v/count/"
+	%[1]vKey= collections.NewPrefix("%[1]v/value/")
+	%[1]vCountKey= collections.NewPrefix("%[1]v/count/")
 )
 `, opts.TypeName.UpperCamel)
 		newFile := genny.NewFileS(path, content)

ignite/templates/typed/map/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush

@@ -11,19 +11,21 @@ import (
 	"google.golang.org/grpc/status"
 )
 
-func (k Keeper) <%= TypeName.UpperCamel %>All(ctx context.Context, req *types.QueryAll<%= TypeName.UpperCamel %>Request) (*types.QueryAll<%= TypeName.UpperCamel %>Response, error) {
+func (q queryServer) <%= TypeName.UpperCamel %>All(ctx context.Context, req *types.QueryAll<%= TypeName.UpperCamel %>Request) (*types.QueryAll<%= TypeName.UpperCamel %>Response, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "invalid request")
 	}
 
 	var <%= TypeName.LowerCamel %>s []types.<%= TypeName.UpperCamel %>
 
-    store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(ctx))
+	// TODO use collections
+
+    store := runtime.KVStoreAdapter(q.k.storeService.OpenKVStore(ctx))
 	<%= TypeName.LowerCamel %>Store := prefix.NewStore(store, types.KeyPrefix(types.<%= TypeName.UpperCamel %>KeyPrefix))
 
 	pageRes, err := query.Paginate(<%= TypeName.LowerCamel %>Store, req.Pagination, func(key []byte, value []byte) error {
 		var <%= TypeName.LowerCamel %> types.<%= TypeName.UpperCamel %>
-		if err := k.cdc.Unmarshal(value, &<%= TypeName.LowerCamel %>); err != nil {
+		if err := q.k.cdc.Unmarshal(value, &<%= TypeName.LowerCamel %>); err != nil {
 			return err
 		}
 
@@ -38,16 +40,16 @@ func (k Keeper) <%= TypeName.UpperCamel %>All(ctx context.Context, req *types.Qu
 	return &types.QueryAll<%= TypeName.UpperCamel %>Response{<%= TypeName.UpperCamel %>: <%= TypeName.LowerCamel %>s, Pagination: pageRes}, nil
 }
 
-func (k Keeper) <%= TypeName.UpperCamel %>(ctx context.Context, req *types.QueryGet<%= TypeName.UpperCamel %>Request) (*types.QueryGet<%= TypeName.UpperCamel %>Response, error) {
+func (q queryServer) <%= TypeName.UpperCamel %>(ctx context.Context, req *types.QueryGet<%= TypeName.UpperCamel %>Request) (*types.QueryGet<%= TypeName.UpperCamel %>Response, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "invalid request")
 	}
 
-	val, found := k.Get<%= TypeName.UpperCamel %>(
+	val, err := q.k.<%= TypeName.UpperCamel %>.Get(
 	    ctx,
 	    <%= for (i, index) in Indexes { %>req.<%= index.Name.UpperCamel %>,
         <% } %>)
-	if !found {
+	if err != nil {
 	    return nil, status.Error(codes.NotFound, "not found")
 	}
 

ignite/templates/typed/singleton/files/component/x/{{moduleName}}/keeper/query_{{typeName}}.go.plush

@@ -19,7 +19,7 @@ func (q queryServer) <%= TypeName.UpperCamel %>(ctx context.Context, req *types.
 	val, err := q.k.<%= TypeName.UpperCamel %>.Get(ctx)
 	if err != nil {
 		if errors.Is(err, collections.ErrNotFound) {
-	    	return nil, status.Error(codes.NotFound, "not found")
+			return nil, status.Error(codes.NotFound, "not found")
 		}
 
 		return nil, status.Error(codes.Internal, "internal error")