mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-05-30 19:06:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

review comments:

Browse Source 
- remove superfluous vars
This commit is contained in:
Ismail Khoffi
2018-12-17 12:28:01 +01:00
parent 8a993c6486
commit 0c8111869f
4 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/tendermint/commands/show_validator.go
View File

@@ -19,7 +19,6 @@ func showValidator(cmd *cobra.Command, args []string) {
// TODO(ismail): add a flag and check if we actually want to see the pub key
// of the remote signer instead of the FilePV
privValidator := privval.LoadOrGenFilePV(config.PrivValidatorFile())
key := privValidator.GetPubKey()
pubKeyJSONBytes, _ := cdc.MarshalJSON(key)
pubKeyJSONBytes, _ := cdc.MarshalJSON(privValidator.GetPubKey())
fmt.Println(string(pubKeyJSONBytes))
}

16
consensus/reactor_test.go
View File

@@ -281,9 +281,7 @@ func TestReactorVotingPowerChange(t *testing.T) {
//---------------------------------------------------------------------------
logger.Debug("---------------------------- Testing changing the voting power of one validator a few times")
pubKey := css[0].privValidator.GetPubKey()
val1PubKey := pubKey
val1PubKey := css[0].privValidator.GetPubKey()
val1PubKeyABCI := types.TM2PB.PubKey(val1PubKey)
updateValidatorTx := kvstore.MakeValSetChangeTx(val1PubKeyABCI, 25)
previousTotalVotingPower := css[0].GetRoundState().LastValidators.TotalVotingPower()
@@ -347,8 +345,7 @@ func TestReactorValidatorSetChanges(t *testing.T) {
//---------------------------------------------------------------------------
logger.Info("---------------------------- Testing adding one validator")
pubKey := css[nVals].privValidator.GetPubKey()
newValidatorPubKey1 := pubKey
newValidatorPubKey1 := css[nVals].privValidator.GetPubKey()
valPubKey1ABCI := types.TM2PB.PubKey(newValidatorPubKey1)
newValidatorTx1 := kvstore.MakeValSetChangeTx(valPubKey1ABCI, testMinPower)
@@ -375,8 +372,7 @@ func TestReactorValidatorSetChanges(t *testing.T) {
//---------------------------------------------------------------------------
logger.Info("---------------------------- Testing changing the voting power of one validator")
pubKey = css[nVals].privValidator.GetPubKey()
updateValidatorPubKey1 := pubKey
updateValidatorPubKey1 := css[nVals].privValidator.GetPubKey()
updatePubKey1ABCI := types.TM2PB.PubKey(updateValidatorPubKey1)
updateValidatorTx1 := kvstore.MakeValSetChangeTx(updatePubKey1ABCI, 25)
previousTotalVotingPower := css[nVals].GetRoundState().LastValidators.TotalVotingPower()
@@ -393,13 +389,11 @@ func TestReactorValidatorSetChanges(t *testing.T) {
//---------------------------------------------------------------------------
logger.Info("---------------------------- Testing adding two validators at once")
pubKey = css[nVals+1].privValidator.GetPubKey()
newValidatorPubKey2 := pubKey
newValidatorPubKey2 := css[nVals+1].privValidator.GetPubKey()
newVal2ABCI := types.TM2PB.PubKey(newValidatorPubKey2)
newValidatorTx2 := kvstore.MakeValSetChangeTx(newVal2ABCI, testMinPower)
pubKey = css[nVals+2].privValidator.GetPubKey()
newValidatorPubKey3 := pubKey
newValidatorPubKey3 := css[nVals+2].privValidator.GetPubKey()
newVal3ABCI := types.TM2PB.PubKey(newValidatorPubKey3)
newValidatorTx3 := kvstore.MakeValSetChangeTx(newVal3ABCI, testMinPower)

1
consensus/replay_test.go
View File

@@ -332,7 +332,6 @@ func testHandshakeReplay(t *testing.T, nBlocks int, mode uint) {
require.NoError(t, err)
pubKey := privVal.GetPubKey()
require.NoError(t, err)
stateDB, state, store := stateAndStore(config, pubKey, kvstore.ProtocolVersion)
store.chain = chain
store.commits = commits

3
consensus/state.go
View File

@@ -1678,8 +1678,7 @@ func (cs *ConsensusState) voteTime() time.Time {
// sign the vote and publish on internalMsgQueue
func (cs *ConsensusState) signAddVote(type_ types.SignedMsgType, hash []byte, header types.PartSetHeader) *types.Vote {
// if we don't have a key or we're not in the validator set, do nothing
privValAddr := cs.privValidator.GetPubKey().Address()
if cs.privValidator == nil || !cs.Validators.HasAddress(privValAddr) {
if cs.privValidator == nil || !cs.Validators.HasAddress(cs.privValidator.GetPubKey().Address()) {
return nil
}
vote, err := cs.signVote(type_, hash, header)