From d9ac7d7c337291af6fc80a4f834d72f674424844 Mon Sep 17 00:00:00 2001 From: frog power 4000 Date: Mon, 20 May 2019 09:13:32 -0400 Subject: [PATCH] Merge PR #4349: Autogen alias files --- x/distribution/alias.go | 217 ++++++++++++------- x/gov/alias.go | 189 ++++++++-------- x/params/alias.go | 68 +++--- x/params/types/keys.go | 8 - x/params/types/proposal.go | 1 + x/staking/alias.go | 391 ++++++++++++++++++++-------------- x/staking/client/cli/query.go | 2 +- x/staking/handler.go | 2 +- 8 files changed, 510 insertions(+), 368 deletions(-) diff --git a/x/distribution/alias.go b/x/distribution/alias.go index c10a760d1c..83407a49b5 100644 --- a/x/distribution/alias.go +++ b/x/distribution/alias.go @@ -1,4 +1,9 @@ // nolint +// autogenerated code using github.com/rigelrozanski/multitool +// aliases generated for the following subdirectories: +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/distribution/keeper +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/distribution/tags +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/distribution/types package distribution import ( @@ -7,78 +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 -) - 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 - - 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 @@ -88,10 +23,138 @@ var ( QueryDelegatorValidators = keeper.QueryDelegatorValidators QueryWithdrawAddr = keeper.QueryWithdrawAddr QueryCommunityPool = keeper.QueryCommunityPool - - // Param types - ParamCommunityTax = keeper.ParamCommunityTax - ParamBaseProposerReward = keeper.ParamBaseProposerReward - ParamBonusProposerReward = keeper.ParamBonusProposerReward - ParamWithdrawAddrEnabled = keeper.ParamWithdrawAddrEnabled + ParamCommunityTax = keeper.ParamCommunityTax + ParamBaseProposerReward = keeper.ParamBaseProposerReward + ParamBonusProposerReward = keeper.ParamBonusProposerReward + ParamWithdrawAddrEnabled = keeper.ParamWithdrawAddrEnabled + DefaultCodespace = types.DefaultCodespace + CodeInvalidInput = types.CodeInvalidInput + CodeNoDistributionInfo = types.CodeNoDistributionInfo + CodeNoValidatorCommission = types.CodeNoValidatorCommission + CodeSetWithdrawAddrDisabled = types.CodeSetWithdrawAddrDisabled + ModuleName = types.ModuleName + StoreKey = types.StoreKey + TStoreKey = types.TStoreKey + RouterKey = types.RouterKey + QuerierRoute = types.QuerierRoute +) + +var ( + // functions aliases + RegisterInvariants = keeper.RegisterInvariants + AllInvariants = keeper.AllInvariants + NonNegativeOutstandingInvariant = keeper.NonNegativeOutstandingInvariant + CanWithdrawInvariant = keeper.CanWithdrawInvariant + ReferenceCountInvariant = keeper.ReferenceCountInvariant + NewKeeper = keeper.NewKeeper + GetValidatorOutstandingRewardsAddress = keeper.GetValidatorOutstandingRewardsAddress + GetDelegatorWithdrawInfoAddress = keeper.GetDelegatorWithdrawInfoAddress + GetDelegatorStartingInfoAddresses = keeper.GetDelegatorStartingInfoAddresses + GetValidatorHistoricalRewardsAddressPeriod = keeper.GetValidatorHistoricalRewardsAddressPeriod + GetValidatorCurrentRewardsAddress = keeper.GetValidatorCurrentRewardsAddress + GetValidatorAccumulatedCommissionAddress = keeper.GetValidatorAccumulatedCommissionAddress + GetValidatorSlashEventAddressHeight = keeper.GetValidatorSlashEventAddressHeight + GetValidatorOutstandingRewardsKey = keeper.GetValidatorOutstandingRewardsKey + GetDelegatorWithdrawAddrKey = keeper.GetDelegatorWithdrawAddrKey + GetDelegatorStartingInfoKey = keeper.GetDelegatorStartingInfoKey + GetValidatorHistoricalRewardsPrefix = keeper.GetValidatorHistoricalRewardsPrefix + GetValidatorHistoricalRewardsKey = keeper.GetValidatorHistoricalRewardsKey + GetValidatorCurrentRewardsKey = keeper.GetValidatorCurrentRewardsKey + GetValidatorAccumulatedCommissionKey = keeper.GetValidatorAccumulatedCommissionKey + GetValidatorSlashEventPrefix = keeper.GetValidatorSlashEventPrefix + GetValidatorSlashEventKey = keeper.GetValidatorSlashEventKey + ParamKeyTable = keeper.ParamKeyTable + NewQuerier = keeper.NewQuerier + NewQueryValidatorOutstandingRewardsParams = keeper.NewQueryValidatorOutstandingRewardsParams + NewQueryValidatorCommissionParams = keeper.NewQueryValidatorCommissionParams + NewQueryValidatorSlashesParams = keeper.NewQueryValidatorSlashesParams + NewQueryDelegationRewardsParams = keeper.NewQueryDelegationRewardsParams + NewQueryDelegatorParams = keeper.NewQueryDelegatorParams + NewQueryDelegatorWithdrawAddrParams = keeper.NewQueryDelegatorWithdrawAddrParams + MakeTestCodec = keeper.MakeTestCodec + CreateTestInputDefault = keeper.CreateTestInputDefault + CreateTestInputAdvanced = keeper.CreateTestInputAdvanced + RegisterCodec = types.RegisterCodec + NewDelegatorStartingInfo = types.NewDelegatorStartingInfo + ErrNilDelegatorAddr = types.ErrNilDelegatorAddr + ErrNilWithdrawAddr = types.ErrNilWithdrawAddr + ErrNilValidatorAddr = types.ErrNilValidatorAddr + ErrNoDelegationDistInfo = types.ErrNoDelegationDistInfo + ErrNoValidatorDistInfo = types.ErrNoValidatorDistInfo + ErrNoValidatorCommission = types.ErrNoValidatorCommission + ErrSetWithdrawAddrDisabled = types.ErrSetWithdrawAddrDisabled + ErrBadDistribution = types.ErrBadDistribution + InitialFeePool = types.InitialFeePool + NewGenesisState = types.NewGenesisState + DefaultGenesisState = types.DefaultGenesisState + ValidateGenesis = types.ValidateGenesis + NewMsgSetWithdrawAddress = types.NewMsgSetWithdrawAddress + NewMsgWithdrawDelegatorReward = types.NewMsgWithdrawDelegatorReward + NewMsgWithdrawValidatorCommission = types.NewMsgWithdrawValidatorCommission + NewQueryDelegatorTotalRewardsResponse = types.NewQueryDelegatorTotalRewardsResponse + NewDelegationDelegatorReward = types.NewDelegationDelegatorReward + NewValidatorHistoricalRewards = types.NewValidatorHistoricalRewards + NewValidatorCurrentRewards = types.NewValidatorCurrentRewards + InitialValidatorAccumulatedCommission = types.InitialValidatorAccumulatedCommission + NewValidatorSlashEvent = types.NewValidatorSlashEvent + + // variable aliases + FeePoolKey = keeper.FeePoolKey + ProposerKey = keeper.ProposerKey + ValidatorOutstandingRewardsPrefix = keeper.ValidatorOutstandingRewardsPrefix + DelegatorWithdrawAddrPrefix = keeper.DelegatorWithdrawAddrPrefix + DelegatorStartingInfoPrefix = keeper.DelegatorStartingInfoPrefix + ValidatorHistoricalRewardsPrefix = keeper.ValidatorHistoricalRewardsPrefix + ValidatorCurrentRewardsPrefix = keeper.ValidatorCurrentRewardsPrefix + ValidatorAccumulatedCommissionPrefix = keeper.ValidatorAccumulatedCommissionPrefix + ValidatorSlashEventPrefix = keeper.ValidatorSlashEventPrefix + ParamStoreKeyCommunityTax = keeper.ParamStoreKeyCommunityTax + ParamStoreKeyBaseProposerReward = keeper.ParamStoreKeyBaseProposerReward + ParamStoreKeyBonusProposerReward = keeper.ParamStoreKeyBonusProposerReward + ParamStoreKeyWithdrawAddrEnabled = keeper.ParamStoreKeyWithdrawAddrEnabled + TestAddrs = keeper.TestAddrs + Rewards = tags.Rewards + Commission = tags.Commission + TxCategory = tags.TxCategory + Validator = tags.Validator + Category = tags.Category + Sender = tags.Sender + ModuleCdc = types.ModuleCdc +) + +type ( + Hooks = keeper.Hooks + Keeper = keeper.Keeper + QueryValidatorOutstandingRewardsParams = keeper.QueryValidatorOutstandingRewardsParams + QueryValidatorCommissionParams = keeper.QueryValidatorCommissionParams + QueryValidatorSlashesParams = keeper.QueryValidatorSlashesParams + QueryDelegationRewardsParams = keeper.QueryDelegationRewardsParams + QueryDelegatorParams = keeper.QueryDelegatorParams + QueryDelegatorWithdrawAddrParams = keeper.QueryDelegatorWithdrawAddrParams + DummyFeeCollectionKeeper = keeper.DummyFeeCollectionKeeper + DelegatorStartingInfo = types.DelegatorStartingInfo + CodeType = types.CodeType + StakingKeeper = types.StakingKeeper + BankKeeper = types.BankKeeper + FeeCollectionKeeper = types.FeeCollectionKeeper + FeePool = types.FeePool + DelegatorWithdrawInfo = types.DelegatorWithdrawInfo + ValidatorOutstandingRewardsRecord = types.ValidatorOutstandingRewardsRecord + ValidatorAccumulatedCommissionRecord = types.ValidatorAccumulatedCommissionRecord + ValidatorHistoricalRewardsRecord = types.ValidatorHistoricalRewardsRecord + ValidatorCurrentRewardsRecord = types.ValidatorCurrentRewardsRecord + DelegatorStartingInfoRecord = types.DelegatorStartingInfoRecord + ValidatorSlashEventRecord = types.ValidatorSlashEventRecord + GenesisState = types.GenesisState + MsgSetWithdrawAddress = types.MsgSetWithdrawAddress + MsgWithdrawDelegatorReward = types.MsgWithdrawDelegatorReward + MsgWithdrawValidatorCommission = types.MsgWithdrawValidatorCommission + QueryDelegatorTotalRewardsResponse = types.QueryDelegatorTotalRewardsResponse + DelegationDelegatorReward = types.DelegationDelegatorReward + ValidatorHistoricalRewards = types.ValidatorHistoricalRewards + ValidatorCurrentRewards = types.ValidatorCurrentRewards + ValidatorAccumulatedCommission = types.ValidatorAccumulatedCommission + ValidatorSlashEvent = types.ValidatorSlashEvent + ValidatorSlashEvents = types.ValidatorSlashEvents + ValidatorOutstandingRewards = types.ValidatorOutstandingRewards ) diff --git a/x/gov/alias.go b/x/gov/alias.go index 708e93e0e0..84a4372964 100644 --- a/x/gov/alias.go +++ b/x/gov/alias.go @@ -1,87 +1,66 @@ -//nolint +// nolint +// autogenerated code using github.com/rigelrozanski/multitool +// aliases generated for the following subdirectories: +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/gov/types package gov -import "github.com/cosmos/cosmos-sdk/x/gov/types" - -const ( - StatusNil = types.StatusNil - StatusDepositPeriod = types.StatusDepositPeriod - StatusVotingPeriod = types.StatusVotingPeriod - StatusPassed = types.StatusPassed - StatusRejected = types.StatusRejected - StatusFailed = types.StatusFailed - - DefaultCodespace = types.DefaultCodespace - DefaultParamspace = types.DefaultParamspace - ModuleName = types.ModuleName - RouterKey = types.RouterKey - StoreKey = types.StoreKey - QuerierRoute = types.QuerierRoute - - ProposalTypeText = types.ProposalTypeText - ProposalTypeSoftwareUpgrade = types.ProposalTypeSoftwareUpgrade - - OptionEmpty = types.OptionEmpty - OptionYes = types.OptionYes - OptionAbstain = types.OptionAbstain - OptionNo = types.OptionNo - OptionNoWithVeto = types.OptionNoWithVeto - - TypeMsgDeposit = types.TypeMsgDeposit - TypeMsgVote = types.TypeMsgVote - TypeMsgSubmitProposal = types.TypeMsgSubmitProposal +import ( + "github.com/cosmos/cosmos-sdk/x/gov/types" ) -type ( - Content = types.Content - Handler = types.Handler - Proposal = types.Proposal - Proposals = types.Proposals - - Deposit = types.Deposit - Deposits = types.Deposits - Vote = types.Vote - Votes = types.Votes - VoteOption = types.VoteOption - - TextProposal = types.TextProposal - SoftwareUpgradeProposal = types.SoftwareUpgradeProposal - ProposalStatus = types.ProposalStatus - - MsgSubmitProposal = types.MsgSubmitProposal - MsgDeposit = types.MsgDeposit - MsgVote = types.MsgVote - - TallyResult = types.TallyResult +const ( + MaxDescriptionLength = types.MaxDescriptionLength + MaxTitleLength = types.MaxTitleLength + DefaultCodespace = types.DefaultCodespace + CodeUnknownProposal = types.CodeUnknownProposal + CodeInactiveProposal = types.CodeInactiveProposal + CodeAlreadyActiveProposal = types.CodeAlreadyActiveProposal + CodeAlreadyFinishedProposal = types.CodeAlreadyFinishedProposal + CodeAddressNotStaked = types.CodeAddressNotStaked + CodeInvalidContent = types.CodeInvalidContent + CodeInvalidProposalType = types.CodeInvalidProposalType + CodeInvalidVote = types.CodeInvalidVote + CodeInvalidGenesis = types.CodeInvalidGenesis + CodeInvalidProposalStatus = types.CodeInvalidProposalStatus + CodeProposalHandlerNotExists = types.CodeProposalHandlerNotExists + ModuleName = types.ModuleName + StoreKey = types.StoreKey + RouterKey = types.RouterKey + QuerierRoute = types.QuerierRoute + DefaultParamspace = types.DefaultParamspace + TypeMsgDeposit = types.TypeMsgDeposit + TypeMsgVote = types.TypeMsgVote + TypeMsgSubmitProposal = types.TypeMsgSubmitProposal + StatusNil = types.StatusNil + StatusDepositPeriod = types.StatusDepositPeriod + StatusVotingPeriod = types.StatusVotingPeriod + StatusPassed = types.StatusPassed + StatusRejected = types.StatusRejected + StatusFailed = types.StatusFailed + ProposalTypeText = types.ProposalTypeText + ProposalTypeSoftwareUpgrade = types.ProposalTypeSoftwareUpgrade + OptionEmpty = types.OptionEmpty + OptionYes = types.OptionYes + OptionAbstain = types.OptionAbstain + OptionNo = types.OptionNo + OptionNoWithVeto = types.OptionNoWithVeto ) var ( - ErrUnknownProposal = types.ErrUnknownProposal - ErrInactiveProposal = types.ErrInactiveProposal - ErrAlreadyActiveProposal = types.ErrAlreadyActiveProposal - ErrAlreadyFinishedProposal = types.ErrAlreadyFinishedProposal - ErrAddressNotStaked = types.ErrAddressNotStaked - ErrInvalidProposalContent = types.ErrInvalidProposalContent - ErrInvalidProposalType = types.ErrInvalidProposalType - ErrInvalidVote = types.ErrInvalidVote - ErrInvalidGenesis = types.ErrInvalidGenesis - ErrNoProposalHandlerExists = types.ErrNoProposalHandlerExists - - NewProposal = types.NewProposal - ProposalHandler = types.ProposalHandler - ValidVoteOption = types.ValidVoteOption - ValidProposalStatus = types.ValidProposalStatus - - ValidateAbstract = types.ValidateAbstract - EmptyTallyResult = types.EmptyTallyResult - - RegisterCodec = types.RegisterCodec - - KeyDelimiter = types.KeyDelimiter - KeyNextProposalID = types.KeyNextProposalID - PrefixActiveProposalQueue = types.PrefixActiveProposalQueue - PrefixInactiveProposalQueue = types.PrefixInactiveProposalQueue - + // functions aliases + RegisterCodec = types.RegisterCodec + RegisterProposalTypeCodec = types.RegisterProposalTypeCodec + ValidateAbstract = types.ValidateAbstract + ErrUnknownProposal = types.ErrUnknownProposal + ErrInactiveProposal = types.ErrInactiveProposal + ErrAlreadyActiveProposal = types.ErrAlreadyActiveProposal + ErrAlreadyFinishedProposal = types.ErrAlreadyFinishedProposal + ErrAddressNotStaked = types.ErrAddressNotStaked + ErrInvalidProposalContent = types.ErrInvalidProposalContent + ErrInvalidProposalType = types.ErrInvalidProposalType + ErrInvalidVote = types.ErrInvalidVote + ErrInvalidGenesis = types.ErrInvalidGenesis + ErrNoProposalHandlerExists = types.ErrNoProposalHandlerExists KeyProposal = types.KeyProposal KeyDeposit = types.KeyDeposit KeyVote = types.KeyVote @@ -91,18 +70,48 @@ var ( KeyActiveProposalQueueProposal = types.KeyActiveProposalQueueProposal PrefixInactiveProposalQueueTime = types.PrefixInactiveProposalQueueTime KeyInactiveProposalQueueProposal = types.KeyInactiveProposalQueueProposal + NewMsgSubmitProposal = types.NewMsgSubmitProposal + NewMsgDeposit = types.NewMsgDeposit + NewMsgVote = types.NewMsgVote + NewProposal = types.NewProposal + ProposalStatusFromString = types.ProposalStatusFromString + ValidProposalStatus = types.ValidProposalStatus + NewTallyResult = types.NewTallyResult + NewTallyResultFromMap = types.NewTallyResultFromMap + EmptyTallyResult = types.EmptyTallyResult + NewTextProposal = types.NewTextProposal + NewSoftwareUpgradeProposal = types.NewSoftwareUpgradeProposal + RegisterProposalType = types.RegisterProposalType + ContentFromProposalType = types.ContentFromProposalType + IsValidProposalType = types.IsValidProposalType + ProposalHandler = types.ProposalHandler + VoteOptionFromString = types.VoteOptionFromString + ValidVoteOption = types.ValidVoteOption - NewMsgSubmitProposal = types.NewMsgSubmitProposal - NewMsgDeposit = types.NewMsgDeposit - NewMsgVote = types.NewMsgVote - NewTextProposal = types.NewTextProposal - NewTallyResultFromMap = types.NewTallyResultFromMap - - ContentFromProposalType = types.ContentFromProposalType - IsValidProposalType = types.IsValidProposalType - VoteOptionFromString = types.VoteOptionFromString - ProposalStatusFromString = types.ProposalStatusFromString - - RegisterProposalType = types.RegisterProposalType - RegisterProposalTypeCodec = types.RegisterProposalTypeCodec + // variable aliases + ModuleCdc = types.ModuleCdc + KeyDelimiter = types.KeyDelimiter + KeyNextProposalID = types.KeyNextProposalID + PrefixActiveProposalQueue = types.PrefixActiveProposalQueue + PrefixInactiveProposalQueue = types.PrefixInactiveProposalQueue +) + +type ( + Content = types.Content + Handler = types.Handler + Deposit = types.Deposit + Deposits = types.Deposits + MsgSubmitProposal = types.MsgSubmitProposal + MsgDeposit = types.MsgDeposit + MsgVote = types.MsgVote + Proposal = types.Proposal + Proposals = types.Proposals + ProposalQueue = types.ProposalQueue + ProposalStatus = types.ProposalStatus + TallyResult = types.TallyResult + TextProposal = types.TextProposal + SoftwareUpgradeProposal = types.SoftwareUpgradeProposal + Vote = types.Vote + Votes = types.Votes + VoteOption = types.VoteOption ) diff --git a/x/params/alias.go b/x/params/alias.go index de8db8711a..0244c93837 100644 --- a/x/params/alias.go +++ b/x/params/alias.go @@ -1,4 +1,8 @@ // nolint +// autogenerated code using github.com/rigelrozanski/multitool +// aliases generated for the following subdirectories: +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/params/subspace +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/params/types package params import ( @@ -6,43 +10,43 @@ import ( "github.com/cosmos/cosmos-sdk/x/params/types" ) -var ( - DefaultCodespace = types.DefaultCodespace +const ( + StoreKey = subspace.StoreKey + TStoreKey = subspace.TStoreKey + TestParamStore = subspace.TestParamStore + DefaultCodespace = types.DefaultCodespace + CodeUnknownSubspace = types.CodeUnknownSubspace + CodeSettingParameter = types.CodeSettingParameter + CodeEmptyData = types.CodeEmptyData + ModuleName = types.ModuleName + RouterKey = types.RouterKey + ProposalTypeChange = types.ProposalTypeChange ) -const ( - ModuleName = types.ModuleName - RouterKey = types.RouterKey - StoreKey = types.StoreKey - TStoreKey = types.TStoreKey - - ProposalTypeChange = types.ProposalTypeChange +var ( + // functions aliases + NewSubspace = subspace.NewSubspace + NewKeyTable = subspace.NewKeyTable + DefaultTestComponents = subspace.DefaultTestComponents + RegisterCodec = types.RegisterCodec + ErrUnknownSubspace = types.ErrUnknownSubspace + ErrSettingParameter = types.ErrSettingParameter + ErrEmptyChanges = types.ErrEmptyChanges + ErrEmptySubspace = types.ErrEmptySubspace + ErrEmptyKey = types.ErrEmptyKey + ErrEmptyValue = types.ErrEmptyValue + NewParameterChangeProposal = types.NewParameterChangeProposal + NewParamChange = types.NewParamChange + ValidateChanges = types.ValidateChanges ) type ( - Subspace = subspace.Subspace - ReadOnlySubspace = subspace.ReadOnlySubspace - ParamSet = subspace.ParamSet - ParamSetPairs = subspace.ParamSetPairs - KeyTable = subspace.KeyTable - + ParamSetPair = subspace.ParamSetPair + ParamSetPairs = subspace.ParamSetPairs + ParamSet = subspace.ParamSet + Subspace = subspace.Subspace + ReadOnlySubspace = subspace.ReadOnlySubspace + KeyTable = subspace.KeyTable ParameterChangeProposal = types.ParameterChangeProposal ParamChange = types.ParamChange ) - -var ( - NewKeyTable = subspace.NewKeyTable - DefaultTestComponents = subspace.DefaultTestComponents - - RegisterCodec = types.RegisterCodec - - NewParamChange = types.NewParamChange - NewParameterChangeProposal = types.NewParameterChangeProposal - - ErrUnknownSubspace = types.ErrUnknownSubspace - ErrSettingParameter = types.ErrSettingParameter - ErrEmptyChanges = types.ErrEmptyChanges - ErrEmptySubspace = types.ErrEmptySubspace - ErrEmptyKey = types.ErrEmptyKey - ErrEmptyValue = types.ErrEmptyValue -) diff --git a/x/params/types/keys.go b/x/params/types/keys.go index b9a5fe05e4..e6b1e301cf 100644 --- a/x/params/types/keys.go +++ b/x/params/types/keys.go @@ -1,17 +1,9 @@ package types -import "github.com/cosmos/cosmos-sdk/x/params/subspace" - const ( // ModuleKey defines the name of the module ModuleName = "params" // RouterKey defines the routing key for a ParameterChangeProposal RouterKey = "params" - - // StoreKey is the string key for the params store - StoreKey = subspace.StoreKey - - // TStoreKey is the string key for the params transient store - TStoreKey = subspace.TStoreKey ) diff --git a/x/params/types/proposal.go b/x/params/types/proposal.go index d4bb2de490..c9f69c2cfe 100644 --- a/x/params/types/proposal.go +++ b/x/params/types/proposal.go @@ -45,6 +45,7 @@ func (pcp ParameterChangeProposal) ProposalRoute() string { return RouterKey } // ProposalType returns the type of a parameter change proposal. func (pcp ParameterChangeProposal) ProposalType() string { return ProposalTypeChange } +// ValidateBasic validates the parameter change proposal func (pcp ParameterChangeProposal) ValidateBasic() sdk.Error { err := govtypes.ValidateAbstract(DefaultCodespace, pcp) if err != nil { diff --git a/x/staking/alias.go b/x/staking/alias.go index 1f28f622c2..a4ce2d498b 100644 --- a/x/staking/alias.go +++ b/x/staking/alias.go @@ -1,4 +1,9 @@ // nolint +// autogenerated code using github.com/rigelrozanski/multitool +// aliases generated for the following subdirectories: +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/staking/keeper +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/staking/querier +// ALIASGEN: github.com/cosmos/cosmos-sdk/x/staking/types package staking import ( @@ -7,179 +12,247 @@ import ( "github.com/cosmos/cosmos-sdk/x/staking/types" ) -type ( - Keeper = keeper.Keeper - FeeCollectionKeeper = types.FeeCollectionKeeper - BankKeeper = types.BankKeeper - DistributionKeeper = types.DistributionKeeper - AccountKeeper = types.AccountKeeper - Validator = types.Validator - Validators = types.Validators - Description = types.Description - Commission = types.Commission - CommissionMsg = types.CommissionMsg - Delegation = types.Delegation - DelegationResp = types.DelegationResponse - DelegationResponses = types.DelegationResponses - Delegations = types.Delegations - UnbondingDelegation = types.UnbondingDelegation - UnbondingDelegations = types.UnbondingDelegations - Redelegation = types.Redelegation - Redelegations = types.Redelegations - RedelegationResponses = types.RedelegationResponses - Params = types.Params - Pool = types.Pool - MultiStakingHooks = types.MultiStakingHooks - MsgCreateValidator = types.MsgCreateValidator - MsgEditValidator = types.MsgEditValidator - MsgDelegate = types.MsgDelegate - MsgUndelegate = types.MsgUndelegate - MsgBeginRedelegate = types.MsgBeginRedelegate - GenesisState = types.GenesisState - QueryDelegatorParams = querier.QueryDelegatorParams - QueryValidatorParams = querier.QueryValidatorParams - QueryBondsParams = querier.QueryBondsParams - QueryRedelegationParams = querier.QueryRedelegationParams - QueryValidatorsParams = querier.QueryValidatorsParams -) - -var ( - NewKeeper = keeper.NewKeeper - - GetValidatorKey = keeper.GetValidatorKey - GetValidatorByConsAddrKey = keeper.GetValidatorByConsAddrKey - GetValidatorsByPowerIndexKey = keeper.GetValidatorsByPowerIndexKey - GetDelegationKey = keeper.GetDelegationKey - GetDelegationsKey = keeper.GetDelegationsKey - PoolKey = keeper.PoolKey - LastValidatorPowerKey = keeper.LastValidatorPowerKey - LastTotalPowerKey = keeper.LastTotalPowerKey - ValidatorsKey = keeper.ValidatorsKey - ValidatorsByConsAddrKey = keeper.ValidatorsByConsAddrKey - ValidatorsByPowerIndexKey = keeper.ValidatorsByPowerIndexKey - DelegationKey = keeper.DelegationKey - GetUBDKey = keeper.GetUBDKey - GetUBDByValIndexKey = keeper.GetUBDByValIndexKey - GetUBDsKey = keeper.GetUBDsKey - GetUBDsByValIndexKey = keeper.GetUBDsByValIndexKey - GetREDKey = keeper.GetREDKey - GetREDByValSrcIndexKey = keeper.GetREDByValSrcIndexKey - GetREDByValDstIndexKey = keeper.GetREDByValDstIndexKey - GetREDsKey = keeper.GetREDsKey - GetREDsFromValSrcIndexKey = keeper.GetREDsFromValSrcIndexKey - GetREDsToValDstIndexKey = keeper.GetREDsToValDstIndexKey - GetREDsByDelToValDstIndexKey = keeper.GetREDsByDelToValDstIndexKey - TestingUpdateValidator = keeper.TestingUpdateValidator - UnbondingQueueKey = keeper.UnbondingQueueKey - RedelegationQueueKey = keeper.RedelegationQueueKey - ValidatorQueueKey = keeper.ValidatorQueueKey - RegisterInvariants = keeper.RegisterInvariants - AllInvariants = keeper.AllInvariants - SupplyInvariants = keeper.SupplyInvariants - NonNegativePowerInvariant = keeper.NonNegativePowerInvariant - PositiveDelegationInvariant = keeper.PositiveDelegationInvariant - DelegatorSharesInvariant = keeper.DelegatorSharesInvariant - - DefaultParamspace = keeper.DefaultParamspace - KeyUnbondingTime = types.KeyUnbondingTime - KeyMaxValidators = types.KeyMaxValidators - KeyBondDenom = types.KeyBondDenom - - ModuleCdc = types.ModuleCdc - DefaultParams = types.DefaultParams - NewParams = types.NewParams - InitialPool = types.InitialPool - NewValidator = types.NewValidator - NewDescription = types.NewDescription - NewCommission = types.NewCommission - NewCommissionMsg = types.NewCommissionMsg - NewCommissionWithTime = types.NewCommissionWithTime - NewGenesisState = types.NewGenesisState - DefaultGenesisState = types.DefaultGenesisState - RegisterCodec = types.RegisterCodec - NewMultiStakingHooks = types.NewMultiStakingHooks - - NewMsgCreateValidator = types.NewMsgCreateValidator - NewMsgEditValidator = types.NewMsgEditValidator - NewMsgDelegate = types.NewMsgDelegate - NewMsgUndelegate = types.NewMsgUndelegate - NewMsgBeginRedelegate = types.NewMsgBeginRedelegate - - NewQuerier = querier.NewQuerier - NewQueryDelegatorParams = querier.NewQueryDelegatorParams - NewQueryValidatorParams = querier.NewQueryValidatorParams - NewQueryBondsParams = querier.NewQueryBondsParams - NewQueryValidatorsParams = querier.NewQueryValidatorsParams - NewQueryRedelegationParams = querier.NewQueryRedelegationParams -) - const ( + DefaultParamspace = keeper.DefaultParamspace QueryValidators = querier.QueryValidators QueryValidator = querier.QueryValidator + QueryDelegatorDelegations = querier.QueryDelegatorDelegations + QueryDelegatorUnbondingDelegations = querier.QueryDelegatorUnbondingDelegations + QueryRedelegations = querier.QueryRedelegations QueryValidatorDelegations = querier.QueryValidatorDelegations QueryValidatorRedelegations = querier.QueryValidatorRedelegations QueryValidatorUnbondingDelegations = querier.QueryValidatorUnbondingDelegations QueryDelegation = querier.QueryDelegation QueryUnbondingDelegation = querier.QueryUnbondingDelegation - QueryDelegatorDelegations = querier.QueryDelegatorDelegations - QueryDelegatorUnbondingDelegations = querier.QueryDelegatorUnbondingDelegations - QueryRedelegations = querier.QueryRedelegations QueryDelegatorValidators = querier.QueryDelegatorValidators QueryDelegatorValidator = querier.QueryDelegatorValidator QueryPool = querier.QueryPool QueryParameters = querier.QueryParameters -) - -const ( - ModuleName = types.ModuleName - StoreKey = types.StoreKey - TStoreKey = types.TStoreKey - QuerierRoute = types.QuerierRoute - RouterKey = types.RouterKey - DefaultCodespace = types.DefaultCodespace - CodeInvalidValidator = types.CodeInvalidValidator - CodeInvalidDelegation = types.CodeInvalidDelegation - CodeInvalidInput = types.CodeInvalidInput - CodeValidatorJailed = types.CodeValidatorJailed - CodeUnauthorized = types.CodeUnauthorized - CodeInternal = types.CodeInternal - CodeUnknownRequest = types.CodeUnknownRequest + DefaultCodespace = types.DefaultCodespace + CodeInvalidValidator = types.CodeInvalidValidator + CodeInvalidDelegation = types.CodeInvalidDelegation + CodeInvalidInput = types.CodeInvalidInput + CodeValidatorJailed = types.CodeValidatorJailed + CodeInvalidAddress = types.CodeInvalidAddress + CodeUnauthorized = types.CodeUnauthorized + CodeInternal = types.CodeInternal + CodeUnknownRequest = types.CodeUnknownRequest + ModuleName = types.ModuleName + StoreKey = types.StoreKey + TStoreKey = types.TStoreKey + QuerierRoute = types.QuerierRoute + RouterKey = types.RouterKey + DefaultUnbondingTime = types.DefaultUnbondingTime + DefaultMaxValidators = types.DefaultMaxValidators + DefaultMaxEntries = types.DefaultMaxEntries + MaxMonikerLength = types.MaxMonikerLength + MaxIdentityLength = types.MaxIdentityLength + MaxWebsiteLength = types.MaxWebsiteLength + MaxDetailsLength = types.MaxDetailsLength + DoNotModifyDesc = types.DoNotModifyDesc ) var ( - ErrNilValidatorAddr = types.ErrNilValidatorAddr - ErrNoValidatorFound = types.ErrNoValidatorFound - ErrValidatorOwnerExists = types.ErrValidatorOwnerExists - ErrValidatorPubKeyExists = types.ErrValidatorPubKeyExists - ErrValidatorPubKeyTypeUnsupported = types.ErrValidatorPubKeyTypeNotSupported - ErrValidatorJailed = types.ErrValidatorJailed - ErrBadRemoveValidator = types.ErrBadRemoveValidator - ErrDescriptionLength = types.ErrDescriptionLength - ErrCommissionNegative = types.ErrCommissionNegative - ErrCommissionHuge = types.ErrCommissionHuge + // functions aliases + RegisterInvariants = keeper.RegisterInvariants + AllInvariants = keeper.AllInvariants + SupplyInvariants = keeper.SupplyInvariants + NonNegativePowerInvariant = keeper.NonNegativePowerInvariant + PositiveDelegationInvariant = keeper.PositiveDelegationInvariant + DelegatorSharesInvariant = keeper.DelegatorSharesInvariant + NewKeeper = keeper.NewKeeper + GetValidatorKey = keeper.GetValidatorKey + GetValidatorByConsAddrKey = keeper.GetValidatorByConsAddrKey + AddressFromLastValidatorPowerKey = keeper.AddressFromLastValidatorPowerKey + GetValidatorsByPowerIndexKey = keeper.GetValidatorsByPowerIndexKey + GetLastValidatorPowerKey = keeper.GetLastValidatorPowerKey + GetValidatorQueueTimeKey = keeper.GetValidatorQueueTimeKey + GetDelegationKey = keeper.GetDelegationKey + GetDelegationsKey = keeper.GetDelegationsKey + GetUBDKey = keeper.GetUBDKey + GetUBDByValIndexKey = keeper.GetUBDByValIndexKey + GetUBDKeyFromValIndexKey = keeper.GetUBDKeyFromValIndexKey + GetUBDsKey = keeper.GetUBDsKey + GetUBDsByValIndexKey = keeper.GetUBDsByValIndexKey + GetUnbondingDelegationTimeKey = keeper.GetUnbondingDelegationTimeKey + GetREDKey = keeper.GetREDKey + GetREDByValSrcIndexKey = keeper.GetREDByValSrcIndexKey + GetREDByValDstIndexKey = keeper.GetREDByValDstIndexKey + GetREDKeyFromValSrcIndexKey = keeper.GetREDKeyFromValSrcIndexKey + GetREDKeyFromValDstIndexKey = keeper.GetREDKeyFromValDstIndexKey + GetRedelegationTimeKey = keeper.GetRedelegationTimeKey + GetREDsKey = keeper.GetREDsKey + GetREDsFromValSrcIndexKey = keeper.GetREDsFromValSrcIndexKey + GetREDsToValDstIndexKey = keeper.GetREDsToValDstIndexKey + GetREDsByDelToValDstIndexKey = keeper.GetREDsByDelToValDstIndexKey + ParamKeyTable = keeper.ParamKeyTable + ValEq = keeper.ValEq + MakeTestCodec = keeper.MakeTestCodec + CreateTestInput = keeper.CreateTestInput + NewPubKey = keeper.NewPubKey + TestAddr = keeper.TestAddr + ValidatorByPowerIndexExists = keeper.ValidatorByPowerIndexExists + TestingUpdateValidator = keeper.TestingUpdateValidator + RandomValidator = keeper.RandomValidator + RandomBondedValidator = keeper.RandomBondedValidator + NewQuerier = querier.NewQuerier + NewQueryDelegatorParams = querier.NewQueryDelegatorParams + NewQueryValidatorParams = querier.NewQueryValidatorParams + NewQueryBondsParams = querier.NewQueryBondsParams + NewQueryRedelegationParams = querier.NewQueryRedelegationParams + NewQueryValidatorsParams = querier.NewQueryValidatorsParams + RegisterCodec = types.RegisterCodec + NewCommissionMsg = types.NewCommissionMsg + NewCommission = types.NewCommission + NewCommissionWithTime = types.NewCommissionWithTime + NewDelegation = types.NewDelegation + MustMarshalDelegation = types.MustMarshalDelegation + MustUnmarshalDelegation = types.MustUnmarshalDelegation + UnmarshalDelegation = types.UnmarshalDelegation + NewUnbondingDelegation = types.NewUnbondingDelegation + NewUnbondingDelegationEntry = types.NewUnbondingDelegationEntry + MustMarshalUBD = types.MustMarshalUBD + MustUnmarshalUBD = types.MustUnmarshalUBD + UnmarshalUBD = types.UnmarshalUBD + NewRedelegation = types.NewRedelegation + NewRedelegationEntry = types.NewRedelegationEntry + MustMarshalRED = types.MustMarshalRED + MustUnmarshalRED = types.MustUnmarshalRED + UnmarshalRED = types.UnmarshalRED + NewDelegationResp = types.NewDelegationResp + NewRedelegationResponse = types.NewRedelegationResponse + NewRedelegationEntryResponse = types.NewRedelegationEntryResponse + ErrNilValidatorAddr = types.ErrNilValidatorAddr + ErrBadValidatorAddr = types.ErrBadValidatorAddr + ErrNoValidatorFound = types.ErrNoValidatorFound + ErrValidatorOwnerExists = types.ErrValidatorOwnerExists + ErrValidatorPubKeyExists = types.ErrValidatorPubKeyExists + ErrValidatorPubKeyTypeNotSupported = types.ErrValidatorPubKeyTypeNotSupported + ErrValidatorJailed = types.ErrValidatorJailed + ErrBadRemoveValidator = types.ErrBadRemoveValidator + ErrDescriptionLength = types.ErrDescriptionLength + ErrCommissionNegative = types.ErrCommissionNegative + ErrCommissionHuge = types.ErrCommissionHuge + ErrCommissionGTMaxRate = types.ErrCommissionGTMaxRate + ErrCommissionUpdateTime = types.ErrCommissionUpdateTime + ErrCommissionChangeRateNegative = types.ErrCommissionChangeRateNegative + ErrCommissionChangeRateGTMaxRate = types.ErrCommissionChangeRateGTMaxRate + ErrCommissionGTMaxChangeRate = types.ErrCommissionGTMaxChangeRate + ErrSelfDelegationBelowMinimum = types.ErrSelfDelegationBelowMinimum + ErrMinSelfDelegationInvalid = types.ErrMinSelfDelegationInvalid + ErrMinSelfDelegationDecreased = types.ErrMinSelfDelegationDecreased + ErrNilDelegatorAddr = types.ErrNilDelegatorAddr + ErrBadDenom = types.ErrBadDenom + ErrBadDelegationAddr = types.ErrBadDelegationAddr + ErrBadDelegationAmount = types.ErrBadDelegationAmount + ErrNoDelegation = types.ErrNoDelegation + ErrBadDelegatorAddr = types.ErrBadDelegatorAddr + ErrNoDelegatorForAddress = types.ErrNoDelegatorForAddress + ErrInsufficientShares = types.ErrInsufficientShares + ErrDelegationValidatorEmpty = types.ErrDelegationValidatorEmpty + ErrNotEnoughDelegationShares = types.ErrNotEnoughDelegationShares + ErrBadSharesAmount = types.ErrBadSharesAmount + ErrBadSharesPercent = types.ErrBadSharesPercent + ErrNotMature = types.ErrNotMature + ErrNoUnbondingDelegation = types.ErrNoUnbondingDelegation + ErrMaxUnbondingDelegationEntries = types.ErrMaxUnbondingDelegationEntries + ErrBadRedelegationAddr = types.ErrBadRedelegationAddr + ErrNoRedelegation = types.ErrNoRedelegation + ErrSelfRedelegation = types.ErrSelfRedelegation + ErrVerySmallRedelegation = types.ErrVerySmallRedelegation + ErrBadRedelegationDst = types.ErrBadRedelegationDst + ErrTransitiveRedelegation = types.ErrTransitiveRedelegation + ErrMaxRedelegationEntries = types.ErrMaxRedelegationEntries + ErrDelegatorShareExRateInvalid = types.ErrDelegatorShareExRateInvalid + ErrBothShareMsgsGiven = types.ErrBothShareMsgsGiven + ErrNeitherShareMsgsGiven = types.ErrNeitherShareMsgsGiven + ErrMissingSignature = types.ErrMissingSignature + NewGenesisState = types.NewGenesisState + DefaultGenesisState = types.DefaultGenesisState + NewMultiStakingHooks = types.NewMultiStakingHooks + NewMsgCreateValidator = types.NewMsgCreateValidator + NewMsgEditValidator = types.NewMsgEditValidator + NewMsgDelegate = types.NewMsgDelegate + NewMsgBeginRedelegate = types.NewMsgBeginRedelegate + NewMsgUndelegate = types.NewMsgUndelegate + NewParams = types.NewParams + DefaultParams = types.DefaultParams + MustUnmarshalParams = types.MustUnmarshalParams + UnmarshalParams = types.UnmarshalParams + InitialPool = types.InitialPool + MustUnmarshalPool = types.MustUnmarshalPool + UnmarshalPool = types.UnmarshalPool + NewValidator = types.NewValidator + MustMarshalValidator = types.MustMarshalValidator + MustUnmarshalValidator = types.MustUnmarshalValidator + UnmarshalValidator = types.UnmarshalValidator + NewDescription = types.NewDescription - ErrNilDelegatorAddr = types.ErrNilDelegatorAddr - ErrBadDenom = types.ErrBadDenom - ErrBadDelegationAmount = types.ErrBadDelegationAmount - ErrNoDelegation = types.ErrNoDelegation - ErrBadDelegatorAddr = types.ErrBadDelegatorAddr - ErrNoDelegatorForAddress = types.ErrNoDelegatorForAddress - ErrInsufficientShares = types.ErrInsufficientShares - ErrDelegationValidatorEmpty = types.ErrDelegationValidatorEmpty - ErrNotEnoughDelegationShares = types.ErrNotEnoughDelegationShares - ErrBadSharesAmount = types.ErrBadSharesAmount - ErrBadSharesPercent = types.ErrBadSharesPercent - - ErrNotMature = types.ErrNotMature - ErrNoUnbondingDelegation = types.ErrNoUnbondingDelegation - ErrNoRedelegation = types.ErrNoRedelegation - ErrBadRedelegationDst = types.ErrBadRedelegationDst - - ErrBothShareMsgsGiven = types.ErrBothShareMsgsGiven - ErrNeitherShareMsgsGiven = types.ErrNeitherShareMsgsGiven - ErrMissingSignature = types.ErrMissingSignature - - ErrMinSelfDelegationInvalid = types.ErrMinSelfDelegationInvalid - ErrMinSelfDelegationDecreased = types.ErrMinSelfDelegationDecreased - ErrSelfDelegationBelowMinimum = types.ErrSelfDelegationBelowMinimum + // variable aliases + PoolKey = keeper.PoolKey + LastValidatorPowerKey = keeper.LastValidatorPowerKey + LastTotalPowerKey = keeper.LastTotalPowerKey + ValidatorsKey = keeper.ValidatorsKey + ValidatorsByConsAddrKey = keeper.ValidatorsByConsAddrKey + ValidatorsByPowerIndexKey = keeper.ValidatorsByPowerIndexKey + DelegationKey = keeper.DelegationKey + UnbondingDelegationKey = keeper.UnbondingDelegationKey + UnbondingDelegationByValIndexKey = keeper.UnbondingDelegationByValIndexKey + RedelegationKey = keeper.RedelegationKey + RedelegationByValSrcIndexKey = keeper.RedelegationByValSrcIndexKey + RedelegationByValDstIndexKey = keeper.RedelegationByValDstIndexKey + UnbondingQueueKey = keeper.UnbondingQueueKey + RedelegationQueueKey = keeper.RedelegationQueueKey + ValidatorQueueKey = keeper.ValidatorQueueKey + Addrs = keeper.Addrs + PKs = keeper.PKs + ModuleCdc = types.ModuleCdc + KeyUnbondingTime = types.KeyUnbondingTime + KeyMaxValidators = types.KeyMaxValidators + KeyMaxEntries = types.KeyMaxEntries + KeyBondDenom = types.KeyBondDenom +) + +type ( + Keeper = keeper.Keeper + QueryDelegatorParams = querier.QueryDelegatorParams + QueryValidatorParams = querier.QueryValidatorParams + QueryBondsParams = querier.QueryBondsParams + QueryRedelegationParams = querier.QueryRedelegationParams + QueryValidatorsParams = querier.QueryValidatorsParams + Commission = types.Commission + CommissionMsg = types.CommissionMsg + DVPair = types.DVPair + DVVTriplet = types.DVVTriplet + Delegation = types.Delegation + Delegations = types.Delegations + UnbondingDelegation = types.UnbondingDelegation + UnbondingDelegationEntry = types.UnbondingDelegationEntry + UnbondingDelegations = types.UnbondingDelegations + Redelegation = types.Redelegation + RedelegationEntry = types.RedelegationEntry + Redelegations = types.Redelegations + DelegationResponse = types.DelegationResponse + DelegationResponses = types.DelegationResponses + RedelegationResponse = types.RedelegationResponse + RedelegationEntryResponse = types.RedelegationEntryResponse + RedelegationResponses = types.RedelegationResponses + CodeType = types.CodeType + DistributionKeeper = types.DistributionKeeper + FeeCollectionKeeper = types.FeeCollectionKeeper + BankKeeper = types.BankKeeper + AccountKeeper = types.AccountKeeper + GenesisState = types.GenesisState + LastValidatorPower = types.LastValidatorPower + MultiStakingHooks = types.MultiStakingHooks + MsgCreateValidator = types.MsgCreateValidator + MsgEditValidator = types.MsgEditValidator + MsgDelegate = types.MsgDelegate + MsgBeginRedelegate = types.MsgBeginRedelegate + MsgUndelegate = types.MsgUndelegate + Params = types.Params + Pool = types.Pool + Validator = types.Validator + Validators = types.Validators + Description = types.Description ) diff --git a/x/staking/client/cli/query.go b/x/staking/client/cli/query.go index 8aaa025190..d720bb3706 100644 --- a/x/staking/client/cli/query.go +++ b/x/staking/client/cli/query.go @@ -209,7 +209,7 @@ $ %s query staking delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p cosm return err } - var resp staking.DelegationResp + var resp staking.DelegationResponse if err := cdc.UnmarshalJSON(res, &resp); err != nil { return err } diff --git a/x/staking/handler.go b/x/staking/handler.go index e2c1e8b03e..0cda2be629 100644 --- a/x/staking/handler.go +++ b/x/staking/handler.go @@ -118,7 +118,7 @@ func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k k if ctx.ConsensusParams() != nil { tmPubKey := tmtypes.TM2PB.PubKey(msg.PubKey) if !common.StringInSlice(tmPubKey.Type, ctx.ConsensusParams().Validator.PubKeyTypes) { - return ErrValidatorPubKeyTypeUnsupported(k.Codespace(), + return ErrValidatorPubKeyTypeNotSupported(k.Codespace(), tmPubKey.Type, ctx.ConsensusParams().Validator.PubKeyTypes).Result() }