Skip to content

Commit

Permalink
rm BeforeTokenizeShareRecordRemoved hooks
Browse files Browse the repository at this point in the history
  • Loading branch information
riley-stride committed Jul 13, 2023
1 parent eec7bca commit f649cff
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 19 deletions.
14 changes: 7 additions & 7 deletions x/staking/keeper/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,10 @@ func (k Keeper) AfterUnbondingInitiated(ctx sdk.Context, id uint64) error {
return nil
}

// This is called before a TokenizeShareRecord is removed
func (k Keeper) BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error {
if k.hooks != nil {
return k.hooks.BeforeTokenizeShareRecordRemoved(ctx, recordID)
}
return nil
}
// // This is called before a TokenizeShareRecord is removed
// func (k Keeper) BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error {
// if k.hooks != nil {
// return k.hooks.BeforeTokenizeShareRecordRemoved(ctx, recordID)
// }
// return nil
// }
6 changes: 3 additions & 3 deletions x/staking/keeper/msg_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -826,9 +826,9 @@ func (k msgServer) RedeemTokensForShares(goCtx context.Context, msg *types.MsgRe
_, found = k.GetDelegation(ctx, record.GetModuleAddress(), valAddr)
if !found {
if k.hooks != nil {
if err := k.hooks.BeforeTokenizeShareRecordRemoved(ctx, record.Id); err != nil {
return nil, err
}
// if err := k.hooks.BeforeTokenizeShareRecordRemoved(ctx, record.Id); err != nil {
// return nil, err
// }
}

err = k.DeleteTokenizeShareRecord(ctx, record.Id)
Expand Down
2 changes: 1 addition & 1 deletion x/staking/types/expected_keepers.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ type StakingHooks interface {
AfterValidatorCreated(ctx sdk.Context, valAddr sdk.ValAddress) // Must be called when a validator is created
BeforeValidatorModified(ctx sdk.Context, valAddr sdk.ValAddress) // Must be called when a validator's state changes
AfterValidatorRemoved(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator is deleted
BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error // Must be called when tokenize share record is deleted
// BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error // Must be called when tokenize share record is deleted

AfterValidatorBonded(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator is bonded
AfterValidatorBeginUnbonding(ctx sdk.Context, consAddr sdk.ConsAddress, valAddr sdk.ValAddress) // Must be called when a validator begins unbonding
Expand Down
16 changes: 8 additions & 8 deletions x/staking/types/hooks.go
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ func (h MultiStakingHooks) AfterUnbondingInitiated(ctx sdk.Context, id uint64) e
return nil
}

func (h MultiStakingHooks) BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error {
for i := range h {
if err := h[i].BeforeTokenizeShareRecordRemoved(ctx, recordID); err != nil {
return err
}
}
return nil
}
// func (h MultiStakingHooks) BeforeTokenizeShareRecordRemoved(ctx sdk.Context, recordID uint64) error {
// for i := range h {
// if err := h[i].BeforeTokenizeShareRecordRemoved(ctx, recordID); err != nil {
// return err
// }
// }
// return nil
// }

0 comments on commit f649cff

Please sign in to comment.