Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: refactor queries of x/collection and x/token #957

Merged
merged 11 commits into from
Apr 13, 2023
Merged

fix: refactor queries of x/collection and x/token #957

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
029c26a
Do not check existence of collection in Query/Balance
0Tech Apr 9, 2023
00b8bc2
Update CHANGELOG.md
0Tech Apr 9, 2023
d4dbad6
Revert "Update CHANGELOG.md"
0Tech Apr 12, 2023
a9a4332
Revert "Do not check existence of collection in Query/Balance"
0Tech Apr 12, 2023
2156936
Revert #956 on x/auth relevant checks
0Tech Apr 12, 2023
5b81b13
Add asset check on Query/HoldersByOperator
0Tech Apr 12, 2023
6ce93af
Wrap non stateful errors with InvalidArgument
0Tech Apr 12, 2023
25d1d3c
Merge branch 'rc/v0.47.0-alpha1' into grpc-query-errors
0Tech Apr 12, 2023
0750a72
Revert gRPC errors on page error
0Tech Apr 12, 2023
46fa27b
Update CHANGELOG.md
0Tech Apr 12, 2023
80c52a6
Increase coverage
0Tech Apr 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Do not check existence of collection in Query/Balance" 
This reverts commit 029c26a.
  • Loading branch information
@0Tech
0Tech committed Apr 12, 2023
commit a9a433206b9b55d79249614ba943c3180efd6798
4 changes: 4 additions & 0 deletions x/collection/keeper/grpc_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ func (s queryServer) Balance(c context.Context, req *collection.QueryBalanceRequ
return nil, err
}

if err := s.validateExistenceOfCollectionGRPC(ctx, req.ContractId); err != nil {
return nil, err
}

balance := s.keeper.GetBalance(ctx, req.ContractId, addr, req.TokenId)
coin := collection.Coin{
TokenId: req.TokenId,
Expand Down
5 changes: 5 additions & 0 deletions x/collection/keeper/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@ func (s *KeeperTestSuite) TestQueryBalance() {
address: sdk.AccAddress("notfound"),
tokenID: tokenID,
},
"collection not found": {
contractID: "deadbeef",
address: s.vendor,
tokenID: tokenID,
},
}

for name, tc := range testCases {
Expand Down