From e1dd2edf63a39a752ad83ce01d14c157361fbc9d Mon Sep 17 00:00:00 2001 From: ThanhNhann Date: Fri, 5 Jan 2024 13:33:02 +0700 Subject: [PATCH] update with Marius Poke's suggestions --- .../improvements/{ => provider}/1503-query-key-assignment.md | 0 x/ccv/provider/keeper/grpc_query.go | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) rename .changelog/unreleased/improvements/{ => provider}/1503-query-key-assignment.md (100%) diff --git a/.changelog/unreleased/improvements/1503-query-key-assignment.md b/.changelog/unreleased/improvements/provider/1503-query-key-assignment.md similarity index 100% rename from .changelog/unreleased/improvements/1503-query-key-assignment.md rename to .changelog/unreleased/improvements/provider/1503-query-key-assignment.md diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 888da43c5d..64f109b4a8 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -198,13 +198,15 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, ctx := sdk.UnwrapSDKContext(goCtx) validatorConsumerAddrs := k.GetAllValidatorsByConsumerAddr(ctx, &req.ChainId) for _, data := range validatorConsumerAddrs { - pubKey, _, _ := k.GetKeyAssignmentReplacement(ctx, req.ChainId, types.ProviderConsAddress{Address: data.ProviderAddr}) + providerAddr := types.NewProviderConsAddress(data.ProviderAddr) + pubKey, _ := k.GetValidatorConsumerPubKey(ctx, req.ChainId, providerAddr) pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ ProviderAddress: string(data.ProviderAddr), ConsumerAddress: string(data.ConsumerAddr), ConsumerKey: &pubKey, }) } + return &types.QueryAllPairsValConAddrByConsumerChainIDResponse{ PairValConAddr: pairValConAddrs, }, nil