Merge PR #2337: Update revoked -> jailed in the docs, and in minor places within cmd

This commit is contained in:
Dev Ojha
2018-09-15 02:52:23 +08:00
committed by Christopher Goes
parent 7dc09d0fc2
commit 9cf40e2df5
6 changed files with 11 additions and 11 deletions
+1 -1
View File
@@ -1003,7 +1003,7 @@ where the processes that caused the consensus to fail (ie. caused clients of
the protocol to accept different values - a fork) can be identified and punished
according to the rules of the protocol, or, possibly, the legal system. When
the legal system is unreliable or excessively expensive to invoke, validators can be forced to make security
deposits in order to participate, and those deposits can be revoked, or slashed,
deposits in order to participate, and those deposits can be jailed, or slashed,
when malicious behaviour is detected [\[10\]][10].
Note this is unlike Bitcoin, where forking is a regular occurence due to
+5 -5
View File
@@ -100,7 +100,7 @@ type TxDelegate struct {
delegate(tx TxDelegate):
pool = getPool()
if validator.Status == Revoked return
if validator.Status == Jailed return
delegation = getDelegatorBond(DelegatorAddr, ValidatorAddr)
if delegation == nil then delegation = NewDelegation(DelegatorAddr, ValidatorAddr)
@@ -141,7 +141,7 @@ startUnbonding(tx TxStartUnbonding):
revokeCandidacy = false
if bond.Shares.IsZero() {
if bond.DelegatorAddr == validator.Operator && validator.Revoked == false
if bond.DelegatorAddr == validator.Operator && validator.Jailed == false
revokeCandidacy = true
removeDelegation( bond)
@@ -157,7 +157,7 @@ startUnbonding(tx TxStartUnbonding):
setUnbondingDelegation(unbondingDelegation)
if revokeCandidacy
validator.Revoked = true
validator.Jailed = true
validator = updateValidator(validator)
@@ -279,9 +279,9 @@ updateBondedValidators(newValidator Validator) (updatedVal Validator)
else
validator = getValidator(operatorAddr)
// if not previously a validator (and unrevoked),
// if not previously a validator (and unjailed),
// kick the cliff validator / bond this new validator
if validator.Status() != Bonded && !validator.Revoked {
if validator.Status() != Bonded && !validator.Jailed {
kickCliffValidator = true
validator = bondValidator(ctx, store, validator)