From 9dfeeb0d7bea7e5d6920db80eb0029240e44d4b4 Mon Sep 17 00:00:00 2001 From: rigelrozanski Date: Mon, 24 Sep 2018 18:54:49 -0400 Subject: [PATCH] address bez comments --- x/stake/handler.go | 1 - x/stake/keeper/delegation.go | 6 ------ x/stake/keeper/validator.go | 8 -------- 3 files changed, 15 deletions(-) diff --git a/x/stake/handler.go b/x/stake/handler.go index b3bf4c018b..21800ffe2c 100644 --- a/x/stake/handler.go +++ b/x/stake/handler.go @@ -87,7 +87,6 @@ func handleMsgCreateValidator(ctx sdk.Context, msg types.MsgCreateValidator, k k return err.Result() } - // call hooks k.OnValidatorCreated(ctx, validator.OperatorAddr) accAddr := sdk.AccAddress(validator.OperatorAddr) k.OnDelegationCreated(ctx, accAddr, validator.OperatorAddr) diff --git a/x/stake/keeper/delegation.go b/x/stake/keeper/delegation.go index a2392ac587..cc46646a73 100644 --- a/x/stake/keeper/delegation.go +++ b/x/stake/keeper/delegation.go @@ -66,10 +66,7 @@ func (k Keeper) SetDelegation(ctx sdk.Context, delegation types.Delegation) { // remove a delegation from store func (k Keeper) RemoveDelegation(ctx sdk.Context, delegation types.Delegation) { - - // call hook k.OnDelegationRemoved(ctx, delegation.DelegatorAddr, delegation.ValidatorAddr) - store := ctx.KVStore(k.storeKey) store.Delete(GetDelegationKey(delegation.DelegatorAddr, delegation.ValidatorAddr)) } @@ -286,7 +283,6 @@ func (k Keeper) Delegate(ctx sdk.Context, delAddr sdk.AccAddress, bondAmt sdk.Co func (k Keeper) unbond(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, shares sdk.Dec) (amount sdk.Dec, err sdk.Error) { - // call hook k.OnDelegationSharesModified(ctx, delAddr, valAddr) // check if delegation has any shares in it unbond @@ -340,9 +336,7 @@ func (k Keeper) unbond(ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValA k.RemoveValidator(ctx, validator.OperatorAddr) } - // call hook k.OnDelegationSharesModified(ctx, delegation.DelegatorAddr, validator.OperatorAddr) - return amount, nil } diff --git a/x/stake/keeper/validator.go b/x/stake/keeper/validator.go index 69bab0f8ec..6e9427d475 100644 --- a/x/stake/keeper/validator.go +++ b/x/stake/keeper/validator.go @@ -633,10 +633,7 @@ func (k Keeper) beginUnbondingValidator(ctx sdk.Context, validator types.Validat // also remove from the Bonded types.Validators Store store.Delete(GetValidatorsBondedIndexKey(validator.OperatorAddr)) - // call hook k.OnValidatorBeginUnbonding(ctx, validator.ConsAddress()) - - // return updated validator return validator } @@ -666,17 +663,13 @@ func (k Keeper) bondValidator(ctx sdk.Context, validator types.Validator) types. tstore := ctx.TransientStore(k.storeTKey) tstore.Set(GetTendermintUpdatesTKey(validator.OperatorAddr), bzABCI) - // call hook k.OnValidatorBonded(ctx, validator.ConsAddress()) - - // return updated validator return validator } // remove the validator record and associated indexes func (k Keeper) RemoveValidator(ctx sdk.Context, address sdk.ValAddress) { - // call hook k.OnValidatorRemoved(ctx, address) // first retrieve the old validator record @@ -745,7 +738,6 @@ func ensureValidatorFound(found bool, ownerAddr []byte) { // get a single validator func (k Keeper) UpdateValidatorCommission(ctx sdk.Context, addr sdk.ValAddress, newCommission sdk.Dec) sdk.Error { - // call hook k.OnValidatorCommissionChange(ctx, addr) validator, _ := k.GetValidator(ctx, addr)