Skip to content

Commit

Permalink
Merge #2932: Update to Tendermint v0.27.0-dev0
Browse files Browse the repository at this point in the history
* Update upstream Tendermint version
* Update PENDING.md
* Fix for accum -> proposer priority
  • Loading branch information
cwgoes authored Nov 28, 2018
1 parent f7e22cb commit aa72e72
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
8 changes: 3 additions & 5 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Gopkg.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

[[override]]
name = "github.com/tendermint/tendermint"
revision = "70a7cae58c8f880aede3b19101e54fb9a7b08c0b"
revision = "v0.27.0-dev0"

## deps without releases:

Expand Down
1 change: 1 addition & 0 deletions PENDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ BREAKING CHANGES
* [\#2798](https://github.com/cosmos/cosmos-sdk/issues/2798) Governance API has miss-spelled English word in JSON response ('depositer' -> 'depositor')

* Tendermint
- Update to Tendermint 0.27.0


FEATURES
Expand Down
16 changes: 8 additions & 8 deletions client/rpc/validators.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ func ValidatorCommand() *cobra.Command {

// Validator output in bech32 format
type ValidatorOutput struct {
Address sdk.ValAddress `json:"address"` // in bech32
PubKey string `json:"pub_key"` // in bech32
Accum int64 `json:"accum"`
VotingPower int64 `json:"voting_power"`
Address sdk.ValAddress `json:"address"` // in bech32
PubKey string `json:"pub_key"` // in bech32
ProposerPriority int64 `json:"proposer_priority"`
VotingPower int64 `json:"voting_power"`
}

// Validators at a certain height output in bech32 format
Expand All @@ -57,10 +57,10 @@ func bech32ValidatorOutput(validator *tmtypes.Validator) (ValidatorOutput, error
}

return ValidatorOutput{
Address: sdk.ValAddress(validator.Address),
PubKey: bechValPubkey,
Accum: validator.Accum,
VotingPower: validator.VotingPower,
Address: sdk.ValAddress(validator.Address),
PubKey: bechValPubkey,
ProposerPriority: validator.ProposerPriority,
VotingPower: validator.VotingPower,
}, nil
}

Expand Down

0 comments on commit aa72e72

Please sign in to comment.