Fix query validator UBDs (cosmos#7228)

Co-authored-by: Alexander Bezobchuk <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
kushagra243 · Sep 2, 2020 · da7a8e6 · da7a8e6
1 parent 979e814
commit da7a8e6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/x/staking/keeper/grpc_query.go b/x/staking/keeper/grpc_query.go
@@ -133,9 +133,13 @@ func (k Querier) ValidatorUnbondingDelegations(c context.Context, req *types.Que
 	ctx := sdk.UnwrapSDKContext(c)
 
 	store := ctx.KVStore(k.storeKey)
-	ubdStore := prefix.NewStore(store, types.GetUBDsByValIndexKey(req.ValidatorAddr))
+	srcValPrefix := types.GetUBDsByValIndexKey(req.ValidatorAddr)
+	ubdStore := prefix.NewStore(store, srcValPrefix)
 	pageRes, err := query.Paginate(ubdStore, req.Pagination, func(key []byte, value []byte) error {
-		ubd, err := types.UnmarshalUBD(k.cdc, value)
+		storeKey := types.GetUBDKeyFromValIndexKey(append(srcValPrefix, key...))
+		storeValue := store.Get(storeKey)
+
+		ubd, err := types.UnmarshalUBD(k.cdc, storeValue)
 		if err != nil {
 			return err
 		}

diff --git a/x/staking/keeper/grpc_query_test.go b/x/staking/keeper/grpc_query_test.go
@@ -706,6 +706,7 @@ func (suite *KeeperTestSuite) TestGRPCQueryValidatorUnbondingDelegations() {
 				suite.NoError(err)
 				suite.Equal(uint64(1), res.Pagination.Total)
 				suite.Equal(1, len(res.UnbondingResponses))
+				suite.Equal(res.UnbondingResponses[0].ValidatorAddress, val1.GetOperator())
 			} else {
 				suite.Error(err)
 				suite.Nil(res)