Merge branch 'master' of github.com:cosmos/cosmos-sdk

x/distribution/alias.go

@@ -12,83 +12,8 @@ import (
 	"github.com/cosmos/cosmos-sdk/x/distribution/types"
 )
 
-type (
-	Keeper = keeper.Keeper
-	Hooks  = keeper.Hooks
-
-	MsgSetWithdrawAddress          = types.MsgSetWithdrawAddress
-	MsgWithdrawDelegatorReward     = types.MsgWithdrawDelegatorReward
-	MsgWithdrawValidatorCommission = types.MsgWithdrawValidatorCommission
-
-	GenesisState = types.GenesisState
-
-	// expected keepers
-	StakingKeeper       = types.StakingKeeper
-	BankKeeper          = types.BankKeeper
-	FeeCollectionKeeper = types.FeeCollectionKeeper
-
-	// querier param types
-	QueryValidatorCommissionParams   = keeper.QueryValidatorCommissionParams
-	QueryValidatorSlashesParams      = keeper.QueryValidatorSlashesParams
-	QueryDelegationRewardsParams     = keeper.QueryDelegationRewardsParams
-	QueryDelegatorWithdrawAddrParams = keeper.QueryDelegatorWithdrawAddrParams
-
-	// querier response types
-	QueryDelegatorTotalRewardsResponse = types.QueryDelegatorTotalRewardsResponse
-	DelegationDelegatorReward          = types.DelegationDelegatorReward
-
-	// proposal types
-	CommunityPoolSpendProposal = types.CommunityPoolSpendProposal
-)
-
 const (
-	ModuleName       = types.ModuleName
-	DefaultCodespace = types.DefaultCodespace
-	CodeInvalidInput = types.CodeInvalidInput
-	StoreKey         = types.StoreKey
-	TStoreKey        = types.TStoreKey
-	RouterKey        = types.RouterKey
-	QuerierRoute     = types.QuerierRoute
-)
-
-var (
-	ErrNilDelegatorAddr = types.ErrNilDelegatorAddr
-	ErrNilWithdrawAddr  = types.ErrNilWithdrawAddr
-	ErrNilValidatorAddr = types.ErrNilValidatorAddr
-
-	TagValidator = tags.Validator
-
-	ModuleCdc                         = types.ModuleCdc
-	NewMsgSetWithdrawAddress          = types.NewMsgSetWithdrawAddress
-	NewMsgWithdrawDelegatorReward     = types.NewMsgWithdrawDelegatorReward
-	NewMsgWithdrawValidatorCommission = types.NewMsgWithdrawValidatorCommission
-
-	NewCommunityPoolSpendProposal = types.NewCommunityPoolSpendProposal
-
-	NewKeeper                                 = keeper.NewKeeper
-	NewQuerier                                = keeper.NewQuerier
-	NewQueryValidatorOutstandingRewardsParams = keeper.NewQueryValidatorOutstandingRewardsParams
-	NewQueryValidatorCommissionParams         = keeper.NewQueryValidatorCommissionParams
-	NewQueryValidatorSlashesParams            = keeper.NewQueryValidatorSlashesParams
-	NewQueryDelegationRewardsParams           = keeper.NewQueryDelegationRewardsParams
-	NewQueryDelegatorParams                   = keeper.NewQueryDelegatorParams
-	NewQueryDelegatorWithdrawAddrParams       = keeper.NewQueryDelegatorWithdrawAddrParams
-	DefaultParamspace                         = keeper.DefaultParamspace
-	RegisterInvariants                        = keeper.RegisterInvariants
-	AllInvariants                             = keeper.AllInvariants
-	NonNegativeOutstandingInvariant           = keeper.NonNegativeOutstandingInvariant
-	CanWithdrawInvariant                      = keeper.CanWithdrawInvariant
-	ReferenceCountInvariant                   = keeper.ReferenceCountInvariant
-	CreateTestInputDefault                    = keeper.CreateTestInputDefault
-	CreateTestInputAdvanced                   = keeper.CreateTestInputAdvanced
-	TestAddrs                                 = keeper.TestAddrs
-
-	RegisterCodec       = types.RegisterCodec
-	DefaultGenesisState = types.DefaultGenesisState
-	ValidateGenesis     = types.ValidateGenesis
-	InitialFeePool      = types.InitialFeePool
-
-	// Query types
+	DefaultParamspace                = keeper.DefaultParamspace
 	QueryParams                      = keeper.QueryParams
 	QueryValidatorOutstandingRewards = keeper.QueryValidatorOutstandingRewards
 	QueryValidatorCommission         = keeper.QueryValidatorCommission
@@ -172,6 +97,7 @@ var (
 	NewValidatorCurrentRewards                 = types.NewValidatorCurrentRewards
 	InitialValidatorAccumulatedCommission      = types.InitialValidatorAccumulatedCommission
 	NewValidatorSlashEvent                     = types.NewValidatorSlashEvent
+	NewCommunityPoolSpendProposal              = types.NewCommunityPoolSpendProposal
 
 	// variable aliases
 	FeePoolKey                           = keeper.FeePoolKey
@@ -220,6 +146,7 @@ type (
 	ValidatorCurrentRewardsRecord          = types.ValidatorCurrentRewardsRecord
 	DelegatorStartingInfoRecord            = types.DelegatorStartingInfoRecord
 	ValidatorSlashEventRecord              = types.ValidatorSlashEventRecord
+	CommunityPoolSpendProposal             = types.CommunityPoolSpendProposal
 	GenesisState                           = types.GenesisState
 	MsgSetWithdrawAddress                  = types.MsgSetWithdrawAddress
 	MsgWithdrawDelegatorReward             = types.MsgWithdrawDelegatorReward