From 5acdc07df4e143cfe1ca55c413eebcfb333c72e1 Mon Sep 17 00:00:00 2001 From: psaradev Date: Wed, 3 Feb 2021 19:59:37 +1000 Subject: [PATCH] reduce power reduction var name --- x/staking/teststaking/tm.go | 8 ++++---- x/staking/types/validator.go | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/x/staking/teststaking/tm.go b/x/staking/teststaking/tm.go index 4c0863f593..e927c0e038 100644 --- a/x/staking/teststaking/tm.go +++ b/x/staking/teststaking/tm.go @@ -20,21 +20,21 @@ func GetTmConsPubKey(v types.Validator) (tmcrypto.PubKey, error) { } // ToTmValidator casts an SDK validator to a tendermint type Validator. -func ToTmValidator(v types.Validator, powerReduction sdk.Int) (*tmtypes.Validator, error) { +func ToTmValidator(v types.Validator, r sdk.Int) (*tmtypes.Validator, error) { tmPk, err := GetTmConsPubKey(v) if err != nil { return nil, err } - return tmtypes.NewValidator(tmPk, v.ConsensusPower(powerReduction)), nil + return tmtypes.NewValidator(tmPk, v.ConsensusPower(r)), nil } // ToTmValidators casts all validators to the corresponding tendermint type. -func ToTmValidators(v types.Validators, powerReduction sdk.Int) ([]*tmtypes.Validator, error) { +func ToTmValidators(v types.Validators, r sdk.Int) ([]*tmtypes.Validator, error) { validators := make([]*tmtypes.Validator, len(v)) var err error for i, val := range v { - validators[i], err = ToTmValidator(val, powerReduction) + validators[i], err = ToTmValidator(val, r) if err != nil { return nil, err } diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index d8b113bbc5..1bed8192cc 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -116,8 +116,8 @@ type ValidatorsByVotingPower []Validator func (valz ValidatorsByVotingPower) Len() int { return len(valz) } -func (valz ValidatorsByVotingPower) Less(i, j int, powerReduction sdk.Int) bool { - if valz[i].ConsensusPower(powerReduction) == valz[j].ConsensusPower(powerReduction) { +func (valz ValidatorsByVotingPower) Less(i, j int, r sdk.Int) bool { + if valz[i].ConsensusPower(r) == valz[j].ConsensusPower(r) { addrI, errI := valz[i].GetConsAddr() addrJ, errJ := valz[j].GetConsAddr() // If either returns error, then return false @@ -126,7 +126,7 @@ func (valz ValidatorsByVotingPower) Less(i, j int, powerReduction sdk.Int) bool } return bytes.Compare(addrI, addrJ) == -1 } - return valz[i].ConsensusPower(powerReduction) > valz[j].ConsensusPower(powerReduction) + return valz[i].ConsensusPower(r) > valz[j].ConsensusPower(r) } func (valz ValidatorsByVotingPower) Swap(i, j int) { @@ -257,7 +257,7 @@ func (d Description) EnsureLength() (Description, error) { // ABCIValidatorUpdate returns an abci.ValidatorUpdate from a staking validator type // with the full validator power -func (v Validator) ABCIValidatorUpdate(powerReduction sdk.Int) abci.ValidatorUpdate { +func (v Validator) ABCIValidatorUpdate(r sdk.Int) abci.ValidatorUpdate { tmProtoPk, err := v.TmConsPublicKey() if err != nil { panic(err) @@ -265,7 +265,7 @@ func (v Validator) ABCIValidatorUpdate(powerReduction sdk.Int) abci.ValidatorUpd return abci.ValidatorUpdate{ PubKey: tmProtoPk, - Power: v.ConsensusPower(powerReduction), + Power: v.ConsensusPower(r), } } @@ -349,17 +349,17 @@ func (v Validator) BondedTokens() sdk.Int { // ConsensusPower gets the consensus-engine power. Aa reduction of 10^6 from // validator tokens is applied -func (v Validator) ConsensusPower(powerReduction sdk.Int) int64 { +func (v Validator) ConsensusPower(r sdk.Int) int64 { if v.IsBonded() { - return v.PotentialConsensusPower(powerReduction) + return v.PotentialConsensusPower(r) } return 0 } // PotentialConsensusPower returns the potential consensus-engine power. -func (v Validator) PotentialConsensusPower(powerReduction sdk.Int) int64 { - return sdk.TokensToConsensusPower(v.Tokens, powerReduction) +func (v Validator) PotentialConsensusPower(r sdk.Int) int64 { + return sdk.TokensToConsensusPower(v.Tokens, r) } // UpdateStatus updates the location of the shares within a validator @@ -507,8 +507,8 @@ func (v Validator) GetConsAddr() (sdk.ConsAddress, error) { func (v Validator) GetTokens() sdk.Int { return v.Tokens } func (v Validator) GetBondedTokens() sdk.Int { return v.BondedTokens() } -func (v Validator) GetConsensusPower(powerReduction sdk.Int) int64 { - return v.ConsensusPower(powerReduction) +func (v Validator) GetConsensusPower(r sdk.Int) int64 { + return v.ConsensusPower(r) } func (v Validator) GetCommission() sdk.Dec { return v.Commission.Rate } func (v Validator) GetMinSelfDelegation() sdk.Int { return v.MinSelfDelegation }