Revert "fix: return nil where the parent not exists in x/collection Q…

…uery/Parent (Finschia#955)" This reverts commit d562b43.
0Tech · Apr 10, 2023 · 8e3e785 · 8e3e785
1 parent 0c74e6f
commit 8e3e785
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/x/collection/keeper/grpc_query.go b/x/collection/keeper/grpc_query.go
@@ -534,7 +534,7 @@ func (s queryServer) Parent(c context.Context, req *collection.QueryParentReques
 
 	parent, err := s.keeper.GetParent(ctx, req.ContractId, req.TokenId)
 	if err != nil {
-		return nil, nil
+		return nil, err
 	}
 
 	token, err := s.keeper.GetNFT(ctx, req.ContractId, *parent)

diff --git a/x/collection/keeper/grpc_query_test.go b/x/collection/keeper/grpc_query_test.go
@@ -790,18 +790,9 @@ func (s *KeeperTestSuite) TestQueryParent() {
 			tokenID:    tokenID,
 			valid:      true,
 			postTest: func(res *collection.QueryParentResponse) {
-				s.Require().NotNil(res)
 				s.Require().Equal(collection.NewNFTID(s.nftClassID, 1), res.Parent.TokenId)
 			},
 		},
-		"valid request with no parent": {
-			contractID: s.contractID,
-			tokenID:    collection.NewNFTID(s.nftClassID, 1),
-			valid:      true,
-			postTest: func(res *collection.QueryParentResponse) {
-				s.Require().Nil(res)
-			},
-		},
 		"invalid contract id": {
 			tokenID: tokenID,
 		},
@@ -816,6 +807,10 @@ func (s *KeeperTestSuite) TestQueryParent() {
 			contractID: s.contractID,
 			tokenID:    collection.NewNFTID("deadbeef", 1),
 		},
+		"no parent": {
+			contractID: s.contractID,
+			tokenID:    collection.NewNFTID(s.nftClassID, 1),
+		},
 	}
 
 	for name, tc := range testCases {
@@ -830,6 +825,7 @@ func (s *KeeperTestSuite) TestQueryParent() {
 				return
 			}
 			s.Require().NoError(err)
+			s.Require().NotNil(res)
 			tc.postTest(res)
 		})
 	}