diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index b88c04bd61..14a5ce41f6 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -207,9 +207,9 @@ message QueryAllPairsValConAddrByConsumerChainIDResponse { message PairValConAddrProviderAndConsumer { // The consensus address of the validator on the provider chain - string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"address\"" ]; + string provider_address = 1 [ (gogoproto.moretags) = "yaml:\"provider_address\"" ]; // The consensus address of the validator on the consumer chain - string consumer_address = 2 [ (gogoproto.moretags) = "yaml:\"address\"" ]; + string consumer_address = 2 [ (gogoproto.moretags) = "yaml:\"consumer_address\"" ]; tendermint.crypto.PublicKey consumer_key = 3; } diff --git a/x/ccv/provider/keeper/grpc_query.go b/x/ccv/provider/keeper/grpc_query.go index 0acb4bb17b..6803c60ddd 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -206,8 +206,8 @@ func (k Keeper) QueryAllPairsValConAddrByConsumerChainID(goCtx context.Context, return nil, err } pairValConAddrs = append(pairValConAddrs, &types.PairValConAddrProviderAndConsumer{ - ProviderAddress: string(data.ProviderAddr), - ConsumerAddress: string(consumerAddr), + ProviderAddress: sdk.ConsAddress(data.ProviderAddr).String(), + ConsumerAddress: consumerAddr.String(), ConsumerKey: data.ConsumerKey, }) } diff --git a/x/ccv/provider/keeper/grpc_query_test.go b/x/ccv/provider/keeper/grpc_query_test.go index 2aa17066fb..3d15eb997c 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -6,6 +6,7 @@ import ( "github.com/stretchr/testify/require" + sdktypes "github.com/cosmos/cosmos-sdk/types" cryptotestutil "github.com/cosmos/interchain-security/v4/testutil/crypto" testkeeper "github.com/cosmos/interchain-security/v4/testutil/keeper" "github.com/cosmos/interchain-security/v4/x/ccv/provider/types" @@ -14,7 +15,10 @@ import ( func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { chainID := consumer - providerAddr := types.NewProviderConsAddress([]byte("providerAddr")) + + providerConsAddress, err := sdktypes.ConsAddressFromBech32("cosmosvalcons1wpex7anfv3jhystyv3eq20r35a") + require.NoError(t, err) + providerAddr := types.NewProviderConsAddress(providerConsAddress) consumerKey := cryptotestutil.NewCryptoIdentityFromIntSeed(1).TMProtoCryptoPublicKey() consumerAddr, err := ccvtypes.TMCryptoPublicKeyToConsAddr(consumerKey) @@ -48,8 +52,8 @@ func TestQueryAllPairsValConAddrByConsumerChainID(t *testing.T) { require.NoError(t, err) expectedResult := types.PairValConAddrProviderAndConsumer{ - ProviderAddress: "providerAddr", - ConsumerAddress: string(consumerAddr), + ProviderAddress: providerConsAddress.String(), + ConsumerAddress: consumerAddr.String(), ConsumerKey: &consumerKey, } require.Equal(t, &consumerKey, response.PairValConAddr[0].ConsumerKey)