From cf7993310d2ff06b7fb717f8a178153c4a8d1de2 Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Thu, 13 Apr 2023 15:53:03 +0900 Subject: [PATCH 1/2] Provide better error message --- x/collection/keeper/grpc_query.go | 10 ++++++++++ x/collection/keeper/grpc_query_test.go | 4 ++++ 2 files changed, 14 insertions(+) diff --git a/x/collection/keeper/grpc_query.go b/x/collection/keeper/grpc_query.go index d0f24adbdf..6d1f516e73 100644 --- a/x/collection/keeper/grpc_query.go +++ b/x/collection/keeper/grpc_query.go @@ -379,6 +379,11 @@ func (s queryServer) TokenType(c context.Context, req *collection.QueryTokenType } ctx := sdk.UnwrapSDKContext(c) + + if err := s.validateExistenceOfCollectionGRPC(ctx, req.ContractId); err != nil { + return nil, err + } + class, err := s.keeper.GetTokenClass(ctx, req.ContractId, classID) if err != nil { return nil, status.Error(codes.NotFound, err.Error()) @@ -454,6 +459,11 @@ func (s queryServer) Token(c context.Context, req *collection.QueryTokenRequest) } ctx := sdk.UnwrapSDKContext(c) + + if err := s.validateExistenceOfCollectionGRPC(ctx, req.ContractId); err != nil { + return nil, err + } + legacyToken, err := s.getToken(ctx, req.ContractId, req.TokenId) if err != nil { return nil, status.Error(codes.NotFound, err.Error()) diff --git a/x/collection/keeper/grpc_query_test.go b/x/collection/keeper/grpc_query_test.go index ee83bf0ce0..60d26e6b7c 100644 --- a/x/collection/keeper/grpc_query_test.go +++ b/x/collection/keeper/grpc_query_test.go @@ -681,6 +681,10 @@ func (s *KeeperTestSuite) TestQueryToken() { "invalid token id": { contractID: s.contractID, }, + "collection not found": { + contractID: "deadbeef", + tokenID: ftTokenID, + }, "no such a fungible token": { contractID: s.contractID, tokenID: collection.NewFTID("00bab10c"), From 7eaeee0e98be1fee8d553f12b4cf80a325a0272f Mon Sep 17 00:00:00 2001 From: Youngtaek Yoon Date: Thu, 13 Apr 2023 18:58:26 +0900 Subject: [PATCH 2/2] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index eef06e8098..d88ff9d993 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ Ref: https://keepachangelog.com/en/1.0.0/ * (x/collection) [\#938](https://github.com/line/lbm-sdk/pull/938) Add progress log into x/collection import-genesis * (x/foundation) [\#952](https://github.com/line/lbm-sdk/pull/952) Address generation of the empty coins in x/foundation * (x/collection,token,foundation) [\#963](https://github.com/line/lbm-sdk/pull/963) Check event determinism on original modules +* (x/collection) [\#965](https://github.com/line/lbm-sdk/pull/965) Provide specific error messages on x/collection queries ### Bug Fixes * (swagger) [\#898](https://github.com/line/lbm-sdk/pull/898) fix a bug not added `lbm.tx.v1beta1.Service/GetBlockWithTxs` in swagger