feat: add consumer info to provider info query

cosmos · Aug 3, 2023 · bcd1ac6 · bcd1ac6
1 parent 9c235c6
commit bcd1ac6
Show file tree

Hide file tree

Showing 3 changed files with 295 additions and 54 deletions.
diff --git a/proto/interchain_security/ccv/consumer/v1/query.proto b/proto/interchain_security/ccv/consumer/v1/query.proto
@@ -60,6 +60,11 @@ message QueryParamsResponse {
 message QueryProviderInfoRequest {}
 
 message QueryProviderInfoResponse {
+  ChainInfo consumer = 1 [ (gogoproto.nullable) = false ];
+  ChainInfo provider = 2 [ (gogoproto.nullable) = false ];
+}
+
+message ChainInfo {
   string ChainID = 1;
   string ClientID = 2;
   string ConnectionID = 3;

diff --git a/x/ccv/consumer/keeper/provider_info.go b/x/ccv/consumer/keeper/provider_info.go
@@ -19,7 +19,7 @@ func (k Keeper) GetProviderChainInfo(ctx sdk.Context) (*types.QueryProviderInfoR
 	}
 
 	// from channel get connection
-	_, consumerConnection, err := k.channelKeeper.GetChannelConnection(ctx, ccvtypes.ConsumerPortID, consumerChannelID)
+	consumerConnectionID, consumerConnection, err := k.channelKeeper.GetChannelConnection(ctx, ccvtypes.ConsumerPortID, consumerChannelID)
 	if err != nil {
 		return nil, err
 	}
@@ -35,10 +35,19 @@ func (k Keeper) GetProviderChainInfo(ctx sdk.Context) (*types.QueryProviderInfoR
 	providerChainID := consumerClientState.(*ibctm.ClientState).ChainId
 
 	resp := types.QueryProviderInfoResponse{
-		ChainID:      providerChainID,
-		ClientID:     providerConnection.GetClientID(),
-		ConnectionID: providerConnection.GetConnectionID(),
-		ChannelID:    providerChannelID,
+		Consumer: types.ChainInfo{
+			ChainID:      "",
+			ClientID:     consumerConnection.GetClientID(),
+			ConnectionID: consumerConnectionID,
+			ChannelID:    consumerChannelID,
+		},
+
+		Provider: types.ChainInfo{
+			ChainID:      providerChainID,
+			ClientID:     providerConnection.GetClientID(),
+			ConnectionID: providerConnection.GetConnectionID(),
+			ChannelID:    providerChannelID,
+		},
 	}
 
 	return &resp, nil