init commit

x/ccv/provider/client/cli/query.go

@@ -36,7 +36,11 @@ func NewQueryCmd() *cobra.Command {
 	cmd.AddCommand(CmdAllPairsValConAddrByConsumerChainID())
 	cmd.AddCommand(CmdProviderParameters())
 	cmd.AddCommand(CmdConsumerChainOptedInValidators())
+<<<<<<< HEAD
 	cmd.AddCommand(CmdConsumerValidators())
+=======
+	cmd.AddCommand(CmdConsumerChainConsumerValidators())
+>>>>>>> 4243eade (init commit)
 	cmd.AddCommand(CmdConsumerChainsValidatorHasToValidate())
 	cmd.AddCommand(CmdValidatorConsumerCommissionRate())
 	cmd.AddCommand(CmdOldestUnconfirmedVsc())
@@ -450,7 +454,11 @@ $ %s consumer-opted-in-validators foochain
 }
 
 // Command to query the consumer validators by consumer chain ID
+<<<<<<< HEAD
 func CmdConsumerValidators() *cobra.Command {
+=======
+func CmdConsumerChainConsumerValidators() *cobra.Command {
+>>>>>>> 4243eade (init commit)
 	cmd := &cobra.Command{
 		Use:   "consumer-validators [chainid]",
 		Short: "Query the last set consumer-validator set for a given consumer chain",
@@ -469,8 +477,13 @@ $ %s consumer-validators foochain
 			}
 			queryClient := types.NewQueryClient(clientCtx)
 
+<<<<<<< HEAD
 			res, err := queryClient.QueryConsumerValidators(cmd.Context(),
 				&types.QueryConsumerValidatorsRequest{ChainId: args[0]})
+=======
+			res, err := queryClient.QueryConsumerChainConsumerValidators(cmd.Context(),
+				&types.QueryConsumerChainConsumerValidatorsRequest{ChainId: args[0]})
+>>>>>>> 4243eade (init commit)
 			if err != nil {
 				return err
 			}