Merge pull request #3191 from tendermint/master

Merge master to develop
This commit is contained in:
Ethan Buchman 2019-01-22 13:19:58 -05:00 committed by GitHub
commit 3362da0a69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View File

@ -98,7 +98,7 @@ func (vals *ValidatorSet) RescalePriorities(diffMax int64) {
// NOTE: This check is merely a sanity check which could be // NOTE: This check is merely a sanity check which could be
// removed if all tests would init. voting power appropriately; // removed if all tests would init. voting power appropriately;
// i.e. diffMax should always be > 0 // i.e. diffMax should always be > 0
if diffMax == 0 { if diffMax <= 0 {
return return
} }