Merge remote-tracking branch 'origin/develop' into rigel/staking-spec…

…-upgradesx2

x/staking/keeper/hooks.go

@@ -32,13 +32,6 @@ func (k Keeper) AfterValidatorBonded(ctx sdk.Context, consAddr sdk.ConsAddress,
 	}
 }
 
-// AfterValidatorPowerDidChange - call hook if registered
-func (k Keeper) AfterValidatorPowerDidChange(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) {
-	if k.hooks != nil {
-		k.hooks.AfterValidatorPowerDidChange(ctx, consAddr, valAddr)
-	}
-}
-
 // AfterValidatorBeginUnbonding - call hook if registered
 func (k Keeper) AfterValidatorBeginUnbonding(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) {
 	if k.hooks != nil {

x/staking/keeper/val_state_change.go

@@ -78,11 +78,7 @@ func (k Keeper) ApplyAndReturnValidatorSetUpdates(ctx sdk.Context) (updates []ab
 		if !found || !bytes.Equal(oldPowerBytes, newPowerBytes) {
 			updates = append(updates, validator.ABCIValidatorUpdate())
 
-			// Assert that the validator had updated its ValidatorDistInfo.FeePoolWithdrawalHeight.
-			// This hook is extremely useful, otherwise lazy accum bugs will be difficult to solve.
-			k.AfterValidatorPowerDidChange(ctx, validator.ConsAddress(), valAddr)
-
-			// set validator power on lookup index.
+			// set validator power on lookup index
 			k.SetLastValidatorPower(ctx, valAddr, newPower)
 		}
 

x/staking/keeper/validator.go

@@ -193,6 +193,9 @@ func (k Keeper) RemoveValidator(ctx sdk.Context, address sdk.ValAddress) {
 	if validator.Tokens.IsPositive() {
 		panic("attempting to remove a validator which still contains tokens")
 	}
+	if validator.Tokens.GT(sdk.ZeroInt()) {
+		panic("validator being removed should never have positive tokens")
+	}
 
 	// delete the old validator record
 	store := ctx.KVStore(k.storeKey)

x/staking/keeper/validator_test.go

@@ -293,11 +293,9 @@ func TestValidatorBasics(t *testing.T) {
 		"attempting to remove a validator which still contains tokens",
 		func() { keeper.RemoveValidator(ctx, validators[1].OperatorAddr) })
 
-	validators[1].Tokens = sdk.ZeroInt()
-	keeper.SetValidator(ctx, validators[1])
-
-	// now it can be removed
-	keeper.RemoveValidator(ctx, validators[1].OperatorAddr)
+	validators[1].Tokens = sdk.ZeroInt()                    // ...remove all tokens
+	keeper.SetValidator(ctx, validators[1])                 // ...set the validator
+	keeper.RemoveValidator(ctx, validators[1].OperatorAddr) // Now it can be removed.
 	_, found = keeper.GetValidator(ctx, addrVals[1])
 	require.False(t, found)
 }