certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #2292: x/staking: Use variable names in switch case

This commit is contained in:
Dev Ojha 2018-09-11 02:14:32 -07:00 committed by Christopher Goes
parent 4f0c3cb25a
commit 2e0fc15dd4
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
x/stake/keeper/validator.go
View File

@ -243,6 +243,11 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type
validator.BondHeight, validator.BondIntraTxCounter = k.bondIncrement(ctx, oldFound, oldValidator, validator) validator.BondHeight, validator.BondIntraTxCounter = k.bondIncrement(ctx, oldFound, oldValidator, validator)
valPower := k.updateValidatorPower(ctx, oldFound, oldValidator, validator, pool) valPower := k.updateValidatorPower(ctx, oldFound, oldValidator, validator, pool)
cliffPower := k.GetCliffValidatorPower(ctx) cliffPower := k.GetCliffValidatorPower(ctx)
cliffValExists := (cliffPower != nil)
var valPowerLTcliffPower bool
if cliffValExists {
valPowerLTcliffPower = (bytes.Compare(valPower, cliffPower) == -1)
}
switch { switch {
@ -256,7 +261,7 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type
bz := k.cdc.MustMarshalBinary(validator.ABCIValidator()) bz := k.cdc.MustMarshalBinary(validator.ABCIValidator())
store.Set(GetTendermintUpdatesKey(validator.OperatorAddr), bz) store.Set(GetTendermintUpdatesKey(validator.OperatorAddr), bz)
if cliffPower != nil { if cliffValExists {
cliffAddr := sdk.ValAddress(k.GetCliffValidator(ctx)) cliffAddr := sdk.ValAddress(k.GetCliffValidator(ctx))
if bytes.Equal(cliffAddr, validator.OperatorAddr) { if bytes.Equal(cliffAddr, validator.OperatorAddr) {
k.updateCliffValidator(ctx, validator) k.updateCliffValidator(ctx, validator)
@ -264,14 +269,13 @@ func (k Keeper) UpdateValidator(ctx sdk.Context, validator types.Validator) type
} }
// if is a new validator and the new power is less than the cliff validator // if is a new validator and the new power is less than the cliff validator
case cliffPower != nil && !oldFound && case cliffValExists && !oldFound && valPowerLTcliffPower:
bytes.Compare(valPower, cliffPower) == -1: //(valPower < cliffPower
// skip to completion // skip to completion
// if was unbonded and the new power is less than the cliff validator // if was unbonded and the new power is less than the cliff validator
case cliffPower != nil && case cliffValExists &&
(oldFound && oldValidator.Status == sdk.Unbonded) && (oldFound && oldValidator.Status == sdk.Unbonded) &&
bytes.Compare(valPower, cliffPower) == -1: //(valPower < cliffPower valPowerLTcliffPower: //(valPower < cliffPower
// skip to completion // skip to completion
default: default: