Merge PR #1511: Prevent unrevoked validators from unrevoking

* Prevent unrevoked validators from unrevoking * Update changelog * Update previously incorrect test * 'make format'
2018-07-03 07:47:40 +02:00
parent d388036454
commit 3f438cdbc2
5 changed files with 41 additions and 4 deletions
@@ -26,6 +26,10 @@ func handleMsgUnrevoke(ctx sdk.Context, msg MsgUnrevoke, k Keeper) sdk.Result {
 		return ErrNoValidatorForAddress(k.codespace).Result()
 	}

+	if !validator.GetRevoked() {
+		return ErrValidatorNotRevoked(k.codespace).Result()
+	}
+
 	addr := validator.GetPubKey().Address()

 	// Signing info must exist