Remove LiquidValidators type

Author: arlai-mk

x/liquid/keeper/grpc_query.go

@@ -64,22 +64,22 @@ func (k Querier) LiquidValidators(c context.Context, req *types.QueryLiquidValid
 	store := runtime.KVStoreAdapter(k.storeService.OpenKVStore(c))
 	valStore := prefix.NewStore(store, types.LiquidValidatorPrefix)
 
-	vals := types.LiquidValidators{}
+	var liquidValidators []types.LiquidValidator
 
 	pageRes, err := query.Paginate(valStore, req.Pagination, func(key, value []byte) error {
 		var val types.LiquidValidator
 		if err := k.cdc.Unmarshal(value, &val); err != nil {
 			return err
 		}
-		vals.LiquidValidators = append(vals.LiquidValidators, val)
+		liquidValidators = append(liquidValidators, val)
 		return nil
 	})
 	if err != nil {
 		return nil, status.Error(codes.Internal, err.Error())
 	}
 
 	return &types.QueryLiquidValidatorsResponse{
-		LiquidValidators: vals.LiquidValidators,
+		LiquidValidators: liquidValidators,
 		Pagination:       pageRes,
 	}, nil
 }

x/liquid/types/liquid_validator.go

@@ -1,11 +1,6 @@
 package types
 
 import (
-	"bytes"
-	"sort"
-	"strings"
-
-	"cosmossdk.io/core/address"
 	"cosmossdk.io/math"
 
 	"github.com/cosmos/cosmos-sdk/codec"
@@ -19,49 +14,6 @@ func NewLiquidValidator(operator string) LiquidValidator {
 	}
 }
 
-// LiquidValidators is a collection of LiquidValidator
-type LiquidValidators struct {
-	LiquidValidators []LiquidValidator
-	ValidatorCodec   address.Codec
-}
-
-func (v LiquidValidators) String() (out string) {
-	for _, val := range v.LiquidValidators {
-		out += val.String() + "\n"
-	}
-
-	return strings.TrimSpace(out)
-}
-
-// Sort Validators sorts validator array in ascending operator address order
-func (v LiquidValidators) Sort() {
-	sort.Sort(v)
-}
-
-// Len implements sort interface
-func (v LiquidValidators) Len() int {
-	return len(v.LiquidValidators)
-}
-
-// Less implements sort interface
-func (v LiquidValidators) Less(i, j int) bool {
-	vi, err := v.ValidatorCodec.StringToBytes(v.LiquidValidators[i].OperatorAddress)
-	if err != nil {
-		panic(err)
-	}
-	vj, err := v.ValidatorCodec.StringToBytes(v.LiquidValidators[j].OperatorAddress)
-	if err != nil {
-		panic(err)
-	}
-
-	return bytes.Compare(vi, vj) == -1
-}
-
-// Swap implements sort interface
-func (v LiquidValidators) Swap(i, j int) {
-	v.LiquidValidators[i], v.LiquidValidators[j] = v.LiquidValidators[j], v.LiquidValidators[i]
-}
-
 func MustMarshalValidator(cdc codec.BinaryCodec, validator *LiquidValidator) []byte {
 	return cdc.MustMarshal(validator)
 }