fix: fixed QueryAllPairsValConAddrByConsumerChainID output formatting…

… (backport #1722) (#1795) fix: fixed QueryAllPairsValConAddrByConsumerChainID output formatting (#1722) * fix: fixed QueryAllPairsValConAddrByConsumerChainID output formatting * fix: name PairValConAddrProviderAndConsumer more appropriately * chore: fixed tests (cherry picked from commit b0c0df9) Co-authored-by: Sergey <[email protected]>
cosmos · Apr 22, 2024 · 1107b30 · 1107b30
1 parent 8df86ea
commit 1107b30
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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)