diff --git a/proto/interchain_security/ccv/provider/v1/query.proto b/proto/interchain_security/ccv/provider/v1/query.proto index 56b06a42c3..b01a7d815c 100644 --- a/proto/interchain_security/ccv/provider/v1/query.proto +++ b/proto/interchain_security/ccv/provider/v1/query.proto @@ -200,9 +200,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 d190a5f8b0..bf9ac18f44 100644 --- a/x/ccv/provider/keeper/grpc_query.go +++ b/x/ccv/provider/keeper/grpc_query.go @@ -203,8 +203,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 e3273d1fb5..f03138e1ee 100644 --- a/x/ccv/provider/keeper/grpc_query_test.go +++ b/x/ccv/provider/keeper/grpc_query_test.go @@ -5,6 +5,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" @@ -13,7 +14,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) @@ -47,8 +51,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)