Rename revoke(d) to jail(ed) #2120
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
cwgoes
requested review from
ebuchman,
rigelrozanski and
zramsay
as code owners
cwgoes
added
ready-for-review
T: API Breaking
fedekunze
reviewed
Aug 22, 2018
| @@ -44,7 +44,7 @@ func (v Validator) GetDelegatorShares() sdk.Dec { | |||
| } | |||
|
|
|||
| // Implements sdk.Validator | |||
| func (v Validator) GetRevoked() bool { | |||
| func (v Validator) GetJailed() bool { | |||
There was a problem hiding this comment.
I'd change it to IsJailed()
There was a problem hiding this comment.
the pattern is GetXYZ() with all the other functions
There was a problem hiding this comment.
I don't disagree with this particular one but it's probably better not to be inconsistent with the rest
fedekunze
reviewed
Aug 22, 2018
| @@ -37,7 +37,7 @@ func (b BondStatus) Equal(b2 BondStatus) bool { | |||
|
|
|||
| // validator for a delegated proof of stake system | |||
| type Validator interface { | |||
| GetRevoked() bool // whether the validator is revoked | |||
| GetJailed() bool // whether the validator is jailed | |||
fedekunze
reviewed
Aug 22, 2018
|
|
||
| // Validator must exist | ||
| validator := k.validatorSet.Validator(ctx, msg.ValidatorAddr) | ||
| if validator == nil { | ||
| return ErrNoValidatorForAddress(k.codespace).Result() | ||
| } | ||
|
|
||
| if !validator.GetRevoked() { | ||
| return ErrValidatorNotRevoked(k.codespace).Result() | ||
| if !validator.GetJailed() { |
fedekunze
reviewed
Aug 22, 2018
| @@ -113,16 +113,16 @@ func (k Keeper) handleValidatorSignature(ctx sdk.Context, addr crypto.Address, p | |||
| minHeight := signInfo.StartHeight + k.SignedBlocksWindow(ctx) | |||
| if height > minHeight && signInfo.SignedBlocksCounter < k.MinSignedPerWindow(ctx) { | |||
| validator := k.validatorSet.ValidatorByPubKey(ctx, pubkey) | |||
| if validator != nil && !validator.GetRevoked() { | |||
| // Downtime confirmed, slash, revoke, and jail the validator | |||
| if validator != nil && !validator.GetJailed() { | |||
fedekunze
reviewed
Aug 22, 2018
| // unrevoke to measure power | ||
| sk.Unrevoke(ctx, val) | ||
| // should be jailed | ||
| require.True(t, sk.Validator(ctx, addr).GetJailed()) |
51 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #1305
docs/)PENDING.mdwith issue #Files changedin the github PR explorerFor Admin Use: