revert all changes related to removing GetAddress() from interface

2026-06-01 03:46:22 +00:00 · 2018-12-18 15:17:53 +01:00
parent 138a57258f
commit 5d6f468b2a
20 changed files with 104 additions and 152 deletions
--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -17,7 +17,6 @@ Special thanks to external contributors on this release:
 * Go API  
 - [types] \#2926 memoize consensus public key on initialization of remote signer and return the memoized key on 
 `PrivValidator.GetPubKey()` instead of requesting it again 
- [types] \#2981 Remove `PrivValidator.GetAddress()`

 * Blockchain Protocol

--- a/blockchain/reactor_test.go
+++ b/blockchain/reactor_test.go
@@ -42,7 +42,7 @@ func randGenesisDoc(numValidators int, randPower bool, minPower int64) (*types.G
 }

 func makeVote(header *types.Header, blockID types.BlockID, valset *types.ValidatorSet, privVal types.PrivValidator) *types.Vote {
-	addr := privVal.GetPubKey().Address()
+	addr := privVal.GetAddress()
 	idx, _ := valset.GetByAddress(addr)
 	vote := &types.Vote{
 		ValidatorAddress: addr,
--- a/cmd/tendermint/commands/init.go
+++ b/cmd/tendermint/commands/init.go
@@ -57,10 +57,9 @@ func initFilesWithConfig(config *cfg.Config) error {
 			GenesisTime:     tmtime.Now(),
 			ConsensusParams: types.DefaultConsensusParams(),
 		}
-		key := pv.GetPubKey()
 		genDoc.Validators = []types.GenesisValidator{{
-			Address: key.Address(),
-			PubKey:  key,
+			Address: pv.GetPubKey().Address(),
+			PubKey:  pv.GetPubKey(),
 			Power:   10,
 		}}

--- a/cmd/tendermint/commands/testnet.go
+++ b/cmd/tendermint/commands/testnet.go
@@ -90,10 +90,9 @@ func testnetFiles(cmd *cobra.Command, args []string) error {

 		pvFile := filepath.Join(nodeDir, config.BaseConfig.PrivValidator)
 		pv := privval.LoadFilePV(pvFile)
-		pubKey := pv.GetPubKey()
 		genVals[i] = types.GenesisValidator{
-			Address: pubKey.Address(),
-			PubKey:  pubKey,
+			Address: pv.GetPubKey().Address(),
+			PubKey:  pv.GetPubKey(),
 			Power:   1,
 			Name:    nodeDirName,
 		}
--- a/consensus/common_test.go
+++ b/consensus/common_test.go
@@ -13,7 +13,7 @@ import (
 	"testing"
 	"time"

-	"github.com/tendermint/tendermint/abci/client"
+	abcicli "github.com/tendermint/tendermint/abci/client"
 	abci "github.com/tendermint/tendermint/abci/types"
 	bc "github.com/tendermint/tendermint/blockchain"
 	cfg "github.com/tendermint/tendermint/config"
@@ -72,10 +72,9 @@ func NewValidatorStub(privValidator types.PrivValidator, valIndex int) *validato
 }

 func (vs *validatorStub) signVote(voteType types.SignedMsgType, hash []byte, header types.PartSetHeader) (*types.Vote, error) {
-	addr := vs.PrivValidator.GetPubKey().Address()
 	vote := &types.Vote{
 		ValidatorIndex:   vs.Index,
-		ValidatorAddress: addr,
+		ValidatorAddress: vs.PrivValidator.GetAddress(),
 		Height:           vs.Height,
 		Round:            vs.Round,
 		Timestamp:        tmtime.Now(),
@@ -152,9 +151,8 @@ func signAddVotes(to *ConsensusState, voteType types.SignedMsgType, hash []byte,

 func validatePrevote(t *testing.T, cs *ConsensusState, round int, privVal *validatorStub, blockHash []byte) {
 	prevotes := cs.Votes.Prevotes(round)
-	address := privVal.GetPubKey().Address()
 	var vote *types.Vote
-	if vote = prevotes.GetByAddress(address); vote == nil {
+	if vote = prevotes.GetByAddress(privVal.GetAddress()); vote == nil {
 		panic("Failed to find prevote from validator")
 	}
 	if blockHash == nil {
@@ -170,9 +168,8 @@ func validatePrevote(t *testing.T, cs *ConsensusState, round int, privVal *valid

 func validateLastPrecommit(t *testing.T, cs *ConsensusState, privVal *validatorStub, blockHash []byte) {
 	votes := cs.LastCommit
-	address := privVal.GetPubKey().Address()
 	var vote *types.Vote
-	if vote = votes.GetByAddress(address); vote == nil {
+	if vote = votes.GetByAddress(privVal.GetAddress()); vote == nil {
 		panic("Failed to find precommit from validator")
 	}
 	if !bytes.Equal(vote.BlockID.Hash, blockHash) {
@@ -182,9 +179,8 @@ func validateLastPrecommit(t *testing.T, cs *ConsensusState, privVal *validatorS

 func validatePrecommit(t *testing.T, cs *ConsensusState, thisRound, lockRound int, privVal *validatorStub, votedBlockHash, lockedBlockHash []byte) {
 	precommits := cs.Votes.Precommits(thisRound)
-	address := privVal.GetPubKey().Address()
 	var vote *types.Vote
-	if vote = precommits.GetByAddress(address); vote == nil {
+	if vote = precommits.GetByAddress(privVal.GetAddress()); vote == nil {
 		panic("Failed to find precommit from validator")
 	}

--- a/consensus/reactor_test.go
+++ b/consensus/reactor_test.go
@@ -143,8 +143,7 @@ func TestReactorWithEvidence(t *testing.T) {
 		// mock the evidence pool
 		// everyone includes evidence of another double signing
 		vIdx := (i + 1) % nValidators
-		addr := privVals[vIdx].GetPubKey().Address()
-		evpool := newMockEvidencePool(addr)
+		evpool := newMockEvidencePool(privVals[vIdx].GetAddress())

 		// Make ConsensusState
 		blockExec := sm.NewBlockExecutor(stateDB, log.TestingLogger(), proxyAppConnCon, mempool, evpool)
@@ -269,8 +268,7 @@ func TestReactorVotingPowerChange(t *testing.T) {
 	// map of active validators
 	activeVals := make(map[string]struct{})
 	for i := 0; i < nVals; i++ {
-		addr := css[i].privValidator.GetPubKey().Address()
-		activeVals[string(addr)] = struct{}{}
+		activeVals[string(css[i].privValidator.GetAddress())] = struct{}{}
 	}

 	// wait till everyone makes block 1
@@ -333,8 +331,7 @@ func TestReactorValidatorSetChanges(t *testing.T) {
 	// map of active validators
 	activeVals := make(map[string]struct{})
 	for i := 0; i < nVals; i++ {
-		addr := css[i].privValidator.GetPubKey().Address()
-		activeVals[string(addr)] = struct{}{}
+		activeVals[string(css[i].privValidator.GetAddress())] = struct{}{}
 	}

 	// wait till everyone makes block 1
--- a/consensus/replay_test.go
+++ b/consensus/replay_test.go
@@ -331,8 +331,7 @@ func testHandshakeReplay(t *testing.T, nBlocks int, mode uint) {
 	chain, commits, err := makeBlockchainFromWAL(wal)
 	require.NoError(t, err)

-	pubKey := privVal.GetPubKey()
-	stateDB, state, store := stateAndStore(config, pubKey, kvstore.ProtocolVersion)
+	stateDB, state, store := stateAndStore(config, privVal.GetPubKey(), kvstore.ProtocolVersion)
 	store.chain = chain
 	store.commits = commits

@@ -347,7 +346,7 @@ func testHandshakeReplay(t *testing.T, nBlocks int, mode uint) {
 		// run nBlocks against a new client to build up the app state.
 		// use a throwaway tendermint state
 		proxyApp := proxy.NewAppConns(clientCreator2)
-		stateDB, state, _ := stateAndStore(config, pubKey, kvstore.ProtocolVersion)
+		stateDB, state, _ := stateAndStore(config, privVal.GetPubKey(), kvstore.ProtocolVersion)
 		buildAppStateFromChain(proxyApp, stateDB, state, chain, nBlocks, mode)
 	}

@@ -635,8 +634,7 @@ func TestInitChainUpdateValidators(t *testing.T) {

 	config := ResetConfig("proxy_test_")
 	privVal := privval.LoadFilePV(config.PrivValidatorFile())
-	pubKey := privVal.GetPubKey()
-	stateDB, state, store := stateAndStore(config, pubKey, 0x0)
+	stateDB, state, store := stateAndStore(config, privVal.GetPubKey(), 0x0)

 	oldValAddr := state.Validators.Validators[0].Address

--- a/consensus/state.go
+++ b/consensus/state.go
@@ -830,14 +830,13 @@ func (cs *ConsensusState) enterPropose(height int64, round int) {
 	}

 	// if not a validator, we're done
-	address := cs.privValidator.GetPubKey().Address()
-	if !cs.Validators.HasAddress(address) {
-		logger.Debug("This node is not a validator", "addr", address, "vals", cs.Validators)
+	if !cs.Validators.HasAddress(cs.privValidator.GetAddress()) {
+		logger.Debug("This node is not a validator", "addr", cs.privValidator.GetAddress(), "vals", cs.Validators)
 		return
 	}
 	logger.Debug("This node is a validator")

-	if cs.isProposer(address) {
+	if cs.isProposer() {
 		logger.Info("enterPropose: Our turn to propose", "proposer", cs.Validators.GetProposer().Address, "privValidator", cs.privValidator)
 		cs.decideProposal(height, round)
 	} else {
@@ -845,8 +844,8 @@ func (cs *ConsensusState) enterPropose(height int64, round int) {
 	}
 }

-func (cs *ConsensusState) isProposer(address []byte) bool {
-	return bytes.Equal(cs.Validators.GetProposer().Address, address)
+func (cs *ConsensusState) isProposer() bool {
+	return bytes.Equal(cs.Validators.GetProposer().Address, cs.privValidator.GetAddress())
 }

 func (cs *ConsensusState) defaultDecideProposal(height int64, round int) {
@@ -931,7 +930,7 @@ func (cs *ConsensusState) createProposalBlock() (block *types.Block, blockParts
 		cs.state.Validators.Size(),
 		len(evidence),
 	), maxGas)
-	proposerAddr := cs.privValidator.GetPubKey().Address()
+	proposerAddr := cs.privValidator.GetAddress()
 	block, parts := cs.state.MakeBlock(cs.Height, txs, commit, evidence, proposerAddr)

 	return block, parts
@@ -1476,8 +1475,7 @@ func (cs *ConsensusState) tryAddVote(vote *types.Vote, peerID p2p.ID) (bool, err
 		if err == ErrVoteHeightMismatch {
 			return added, err
 		} else if voteErr, ok := err.(*types.ErrVoteConflictingVotes); ok {
-			addr := cs.privValidator.GetPubKey().Address()
-			if bytes.Equal(vote.ValidatorAddress, addr) {
+			if bytes.Equal(vote.ValidatorAddress, cs.privValidator.GetAddress()) {
 				cs.Logger.Error("Found conflicting vote from ourselves. Did you unsafe_reset a validator?", "height", vote.Height, "round", vote.Round, "type", vote.Type)
 				return added, err
 			}
@@ -1642,7 +1640,7 @@ func (cs *ConsensusState) addVote(vote *types.Vote, peerID p2p.ID) (added bool,
 }

 func (cs *ConsensusState) signVote(type_ types.SignedMsgType, hash []byte, header types.PartSetHeader) (*types.Vote, error) {
-	addr := cs.privValidator.GetPubKey().Address()
+	addr := cs.privValidator.GetAddress()
 	valIndex, _ := cs.Validators.GetByAddress(addr)

 	vote := &types.Vote{
@@ -1678,7 +1676,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
-	if cs.privValidator == nil || !cs.Validators.HasAddress(cs.privValidator.GetPubKey().Address()) {
+	if cs.privValidator == nil || !cs.Validators.HasAddress(cs.privValidator.GetAddress()) {
 		return nil
 	}
 	vote, err := cs.signVote(type_, hash, header)
--- a/consensus/state_test.go
+++ b/consensus/state_test.go
@@ -73,8 +73,7 @@ func TestStateProposerSelection0(t *testing.T) {

 	// Commit a block and ensure proposer for the next height is correct.
 	prop := cs1.GetRoundState().Validators.GetProposer()
-	address := cs1.privValidator.GetPubKey().Address()
-	if !bytes.Equal(prop.Address, address) {
+	if !bytes.Equal(prop.Address, cs1.privValidator.GetAddress()) {
 		t.Fatalf("expected proposer to be validator %d. Got %X", 0, prop.Address)
 	}

@@ -88,8 +87,7 @@ func TestStateProposerSelection0(t *testing.T) {
 	ensureNewRound(newRoundCh, height+1, 0)

 	prop = cs1.GetRoundState().Validators.GetProposer()
-	addr := vss[1].GetPubKey().Address()
-	if !bytes.Equal(prop.Address, addr) {
+	if !bytes.Equal(prop.Address, vss[1].GetAddress()) {
 		panic(fmt.Sprintf("expected proposer to be validator %d. Got %X", 1, prop.Address))
 	}
 }
@@ -112,8 +110,7 @@ func TestStateProposerSelection2(t *testing.T) {
 	// everyone just votes nil. we get a new proposer each round
 	for i := 0; i < len(vss); i++ {
 		prop := cs1.GetRoundState().Validators.GetProposer()
-		addr := vss[(i+round)%len(vss)].GetPubKey().Address()
-		correctProposer := addr
+		correctProposer := vss[(i+round)%len(vss)].GetAddress()
 		if !bytes.Equal(prop.Address, correctProposer) {
 			panic(fmt.Sprintf("expected RoundState.Validators.GetProposer() to be validator %d. Got %X", (i+2)%len(vss), prop.Address))
 		}
@@ -508,8 +505,7 @@ func TestStateLockPOLRelock(t *testing.T) {

 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	proposalCh := subscribe(cs1.eventBus, types.EventQueryCompleteProposal)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	newBlockCh := subscribe(cs1.eventBus, types.EventQueryNewBlockHeader)

@@ -600,8 +596,7 @@ func TestStateLockPOLUnlock(t *testing.T) {
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	unlockCh := subscribe(cs1.eventBus, types.EventQueryUnlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// everything done from perspective of cs1

@@ -694,8 +689,7 @@ func TestStateLockPOLSafety1(t *testing.T) {
 	timeoutProposeCh := subscribe(cs1.eventBus, types.EventQueryTimeoutPropose)
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round and wait for propose and prevote
 	startTestRound(cs1, cs1.Height, round)
@@ -811,8 +805,7 @@ func TestStateLockPOLSafety2(t *testing.T) {
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	unlockCh := subscribe(cs1.eventBus, types.EventQueryUnlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// the block for R0: gets polkad but we miss it
 	// (even though we signed it, shhh)
@@ -903,8 +896,7 @@ func TestProposeValidBlock(t *testing.T) {
 	timeoutProposeCh := subscribe(cs1.eventBus, types.EventQueryTimeoutPropose)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	unlockCh := subscribe(cs1.eventBus, types.EventQueryUnlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round and wait for propose and prevote
 	startTestRound(cs1, cs1.Height, round)
@@ -990,8 +982,7 @@ func TestSetValidBlockOnDelayedPrevote(t *testing.T) {
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	validBlockCh := subscribe(cs1.eventBus, types.EventQueryValidBlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round and wait for propose and prevote
 	startTestRound(cs1, cs1.Height, round)
@@ -1050,8 +1041,7 @@ func TestSetValidBlockOnDelayedProposal(t *testing.T) {
 	timeoutProposeCh := subscribe(cs1.eventBus, types.EventQueryTimeoutPropose)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	validBlockCh := subscribe(cs1.eventBus, types.EventQueryValidBlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())
 	proposalCh := subscribe(cs1.eventBus, types.EventQueryCompleteProposal)

 	round = round + 1 // move to round in which P0 is not proposer
@@ -1121,8 +1111,7 @@ func TestWaitingTimeoutProposeOnNewRound(t *testing.T) {

 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutPropose)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round
 	startTestRound(cs1, height, round)
@@ -1155,8 +1144,7 @@ func TestRoundSkipOnNilPolkaFromHigherRound(t *testing.T) {

 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round
 	startTestRound(cs1, height, round)
@@ -1189,8 +1177,7 @@ func TestWaitTimeoutProposeOnNilPolkaForTheCurrentRound(t *testing.T) {

 	timeoutProposeCh := subscribe(cs1.eventBus, types.EventQueryTimeoutPropose)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round in which PO is not proposer
 	startTestRound(cs1, height, round)
@@ -1374,8 +1361,7 @@ func TestStateHalt1(t *testing.T) {
 	timeoutWaitCh := subscribe(cs1.eventBus, types.EventQueryTimeoutWait)
 	newRoundCh := subscribe(cs1.eventBus, types.EventQueryNewRound)
 	newBlockCh := subscribe(cs1.eventBus, types.EventQueryNewBlock)
-	addr := cs1.privValidator.GetPubKey().Address()
-	voteCh := subscribeToVoter(cs1, addr)
+	voteCh := subscribeToVoter(cs1, cs1.privValidator.GetAddress())

 	// start round and wait for propose and prevote
 	startTestRound(cs1, height, round)
--- a/consensus/types/height_vote_set_test.go
+++ b/consensus/types/height_vote_set_test.go
@@ -50,9 +50,8 @@ func TestPeerCatchupRounds(t *testing.T) {

 func makeVoteHR(t *testing.T, height int64, round int, privVals []types.PrivValidator, valIndex int) *types.Vote {
 	privVal := privVals[valIndex]
-	addr := privVal.GetPubKey().Address()
 	vote := &types.Vote{
-		ValidatorAddress: addr,
+		ValidatorAddress: privVal.GetAddress(),
 		ValidatorIndex:   valIndex,
 		Height:           height,
 		Round:            round,
--- a/node/node.go
+++ b/node/node.go
@@ -240,19 +240,16 @@ func NewNode(config *cfg.Config,
 	fastSync := config.FastSync
 	if state.Validators.Size() == 1 {
 		addr, _ := state.Validators.GetByIndex(0)
-		privValAddr := privValidator.GetPubKey().Address()
-		if bytes.Equal(privValAddr, addr) {
+		if bytes.Equal(privValidator.GetAddress(), addr) {
 			fastSync = false
 		}
 	}

-	pubKey := privValidator.GetPubKey()
-	addr := pubKey.Address()
 	// Log whether this node is a validator or an observer
-	if state.Validators.HasAddress(addr) {
-		consensusLogger.Info("This node is a validator", "addr", addr, "pubKey", pubKey)
+	if state.Validators.HasAddress(privValidator.GetAddress()) {
+		consensusLogger.Info("This node is a validator", "addr", privValidator.GetAddress(), "pubKey", privValidator.GetPubKey())
 	} else {
-		consensusLogger.Info("This node is not a validator", "addr", addr, "pubKey", pubKey)
+		consensusLogger.Info("This node is not a validator", "addr", privValidator.GetAddress(), "pubKey", privValidator.GetPubKey())
 	}

 	csMetrics, p2pMetrics, memplMetrics, smMetrics := metricsProvider()
@@ -620,8 +617,7 @@ func (n *Node) ConfigureRPC() {
 	rpccore.SetEvidencePool(n.evidencePool)
 	rpccore.SetP2PPeers(n.sw)
 	rpccore.SetP2PTransport(n)
-	pubKey := n.privValidator.GetPubKey()
-	rpccore.SetPubKey(pubKey)
+	rpccore.SetPubKey(n.privValidator.GetPubKey())
 	rpccore.SetGenesisDoc(n.genesisDoc)
 	rpccore.SetAddrBook(n.addrBook)
 	rpccore.SetProxyAppQuery(n.proxyApp.Query())
--- a/privval/priv_validator.go
+++ b/privval/priv_validator.go
@@ -56,6 +56,12 @@ type FilePV struct {
 	mtx      sync.Mutex
 }

+// GetAddress returns the address of the validator.
+// Implements PrivValidator.
+func (pv *FilePV) GetAddress() types.Address {
+	return pv.Address
+}
+
 // GetPubKey returns the public key of the validator.
 // Implements PrivValidator.
 func (pv *FilePV) GetPubKey() crypto.PubKey {
@@ -286,9 +292,7 @@ func (pv *FilePV) saveSigned(height int64, round int, step int8,

 // String returns a string representation of the FilePV.
 func (pv *FilePV) String() string {
-	// does not error in FilePV:
-	addr := pv.GetPubKey().Address()
-	return fmt.Sprintf("PrivValidator{%v LH:%v, LR:%v, LS:%v}", addr, pv.LastHeight, pv.LastRound, pv.LastStep)
+	return fmt.Sprintf("PrivValidator{%v LH:%v, LR:%v, LS:%v}", pv.GetAddress(), pv.LastHeight, pv.LastRound, pv.LastStep)
 }

 //-------------------------------------
--- a/privval/priv_validator_test.go
+++ b/privval/priv_validator_test.go
@@ -25,11 +25,10 @@ func TestGenLoadValidator(t *testing.T) {
 	height := int64(100)
 	privVal.LastHeight = height
 	privVal.Save()
-	addr := privVal.GetPubKey().Address()
+	addr := privVal.GetAddress()

 	privVal = LoadFilePV(tempFile.Name())
-	loadedAddr := privVal.GetPubKey().Address()
-	assert.Equal(addr, loadedAddr)
+	assert.Equal(addr, privVal.GetAddress(), "expected privval addr to be the same")
 	assert.Equal(height, privVal.LastHeight, "expected privval.LastHeight to have been saved")
 }

@@ -43,10 +42,9 @@ func TestLoadOrGenValidator(t *testing.T) {
 		t.Error(err)
 	}
 	privVal := LoadOrGenFilePV(tempFilePath)
-	addr := privVal.GetPubKey().Address()
+	addr := privVal.GetAddress()
 	privVal = LoadOrGenFilePV(tempFilePath)
-	loadedAddr := privVal.GetPubKey().Address()
-	assert.Equal(addr, loadedAddr)
+	assert.Equal(addr, privVal.GetAddress(), "expected privval addr to be the same")
 }

 func TestUnmarshalValidator(t *testing.T) {
@@ -83,10 +81,8 @@ func TestUnmarshalValidator(t *testing.T) {
 	require.Nil(err, "%+v", err)

 	// make sure the values match
-	loadedAddr := val.GetPubKey().Address()
-	assert.EqualValues(addr, loadedAddr)
-	loadedKey := val.GetPubKey()
-	assert.EqualValues(pubKey, loadedKey)
+	assert.EqualValues(addr, val.GetAddress())
+	assert.EqualValues(pubKey, val.GetPubKey())
 	assert.EqualValues(privKey, val.PrivKey)

 	// export it and make sure it is the same
--- a/privval/remote_signer.go
+++ b/privval/remote_signer.go
@@ -44,6 +44,11 @@ func (sc *RemoteSignerClient) GetPubKey() crypto.PubKey {
 	return sc.consensusPubKey
 }

+// GetAddress implements PrivValidator.
+func (sc *RemoteSignerClient) GetAddress() types.Address {
+	return sc.consensusPubKey.Address()
+}
+
 func (sc *RemoteSignerClient) getPubKey() (crypto.PubKey, error) {
 	err := writeMsg(sc.conn, &PubKeyRequest{})
 	if err != nil {
--- a/types/evidence_test.go
+++ b/types/evidence_test.go
@@ -17,9 +17,8 @@ type voteData struct {
 }

 func makeVote(val PrivValidator, chainID string, valIndex int, height int64, round, step int, blockID BlockID) *Vote {
-	addr := val.GetPubKey().Address()
 	v := &Vote{
-		ValidatorAddress: addr,
+		ValidatorAddress: val.GetAddress(),
 		ValidatorIndex:   valIndex,
 		Height:           height,
 		Round:            round,
--- a/types/priv_validator.go
+++ b/types/priv_validator.go
@@ -12,6 +12,7 @@ import (
 // PrivValidator defines the functionality of a local Tendermint validator
 // that signs votes and proposals, and never double signs.
 type PrivValidator interface {
+	GetAddress() Address // redundant since .PubKey().Address()
 	GetPubKey() crypto.PubKey

 	SignVote(chainID string, vote *Vote) error
@@ -28,7 +29,7 @@ func (pvs PrivValidatorsByAddress) Len() int {
 }

 func (pvs PrivValidatorsByAddress) Less(i, j int) bool {
-	return bytes.Compare(pvs[i].GetPubKey().Address(), pvs[j].GetPubKey().Address()) == -1
+	return bytes.Compare(pvs[i].GetAddress(), pvs[j].GetAddress()) == -1
 }

 func (pvs PrivValidatorsByAddress) Swap(i, j int) {
@@ -50,6 +51,11 @@ func NewMockPV() *MockPV {
 	return &MockPV{ed25519.GenPrivKey()}
 }

+// Implements PrivValidator.
+func (pv *MockPV) GetAddress() Address {
+	return pv.privKey.PubKey().Address()
+}
+
 // Implements PrivValidator.
 func (pv *MockPV) GetPubKey() crypto.PubKey {
 	return pv.privKey.PubKey()
@@ -79,8 +85,7 @@ func (pv *MockPV) SignProposal(chainID string, proposal *Proposal) error {

 // String returns a string representation of the MockPV.
 func (pv *MockPV) String() string {
-	addr := pv.GetPubKey().Address()
-	return fmt.Sprintf("MockPV{%v}", addr)
+	return fmt.Sprintf("MockPV{%v}", pv.GetAddress())
 }

 // XXX: Implement.
--- a/types/protobuf_test.go
+++ b/types/protobuf_test.go
@@ -142,15 +142,14 @@ func TestABCIEvidence(t *testing.T) {
 	blockID := makeBlockID([]byte("blockhash"), 1000, []byte("partshash"))
 	blockID2 := makeBlockID([]byte("blockhash2"), 1000, []byte("partshash"))
 	const chainID = "mychain"
-	pubKey := val.GetPubKey()
 	ev := &DuplicateVoteEvidence{
-		PubKey: pubKey,
+		PubKey: val.GetPubKey(),
 		VoteA:  makeVote(val, chainID, 0, 10, 2, 1, blockID),
 		VoteB:  makeVote(val, chainID, 0, 10, 2, 1, blockID2),
 	}
 	abciEv := TM2PB.Evidence(
 		ev,
-		NewValidatorSet([]*Validator{NewValidator(pubKey, 10)}),
+		NewValidatorSet([]*Validator{NewValidator(val.GetPubKey(), 10)}),
 		time.Now(),
 	)

--- a/types/test_util.go
+++ b/types/test_util.go
@@ -10,9 +10,9 @@ func MakeCommit(blockID BlockID, height int64, round int,

 	// all sign
 	for i := 0; i < len(validators); i++ {
-		addr := validators[i].GetPubKey().Address()
+
 		vote := &Vote{
-			ValidatorAddress: addr,
+			ValidatorAddress: validators[i].GetAddress(),
 			ValidatorIndex:   i,
 			Height:           height,
 			Round:            round,
--- a/types/validator.go
+++ b/types/validator.go
@@ -101,7 +101,6 @@ func RandValidator(randPower bool, minPower int64) (*Validator, PrivValidator) {
 	if randPower {
 		votePower += int64(cmn.RandUint32())
 	}
-	pubKey := privVal.GetPubKey()
-	val := NewValidator(pubKey, votePower)
+	val := NewValidator(privVal.GetPubKey(), votePower)
 	return val, privVal
 }
--- a/types/vote_set_test.go
+++ b/types/vote_set_test.go
@@ -66,8 +66,7 @@ func TestAddVote(t *testing.T) {

 	// t.Logf(">> %v", voteSet)

-	val0Addr := val0.GetPubKey().Address()
-	if voteSet.GetByAddress(val0Addr) != nil {
+	if voteSet.GetByAddress(val0.GetAddress()) != nil {
 		t.Errorf("Expected GetByAddress(val0.Address) to be nil")
 	}
 	if voteSet.BitArray().GetIndex(0) {
@@ -79,7 +78,7 @@ func TestAddVote(t *testing.T) {
 	}

 	vote := &Vote{
-		ValidatorAddress: val0Addr,
+		ValidatorAddress: val0.GetAddress(),
 		ValidatorIndex:   0, // since privValidators are in order
 		Height:           height,
 		Round:            round,
@@ -92,7 +91,7 @@ func TestAddVote(t *testing.T) {
 		t.Error(err)
 	}

-	if voteSet.GetByAddress(val0Addr) == nil {
+	if voteSet.GetByAddress(val0.GetAddress()) == nil {
 		t.Errorf("Expected GetByAddress(val0.Address) to be present")
 	}
 	if !voteSet.BitArray().GetIndex(0) {
@@ -119,8 +118,7 @@ func Test2_3Majority(t *testing.T) {
 	}
 	// 6 out of 10 voted for nil.
 	for i := 0; i < 6; i++ {
-		addr := privValidators[i].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, i)
+		vote := withValidator(voteProto, privValidators[i].GetAddress(), i)
 		_, err := signAddVote(privValidators[i], vote, voteSet)
 		if err != nil {
 			t.Error(err)
@@ -133,8 +131,7 @@ func Test2_3Majority(t *testing.T) {

 	// 7th validator voted for some blockhash
 	{
-		addr := privValidators[6].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 6)
+		vote := withValidator(voteProto, privValidators[6].GetAddress(), 6)
 		_, err := signAddVote(privValidators[6], withBlockHash(vote, cmn.RandBytes(32)), voteSet)
 		if err != nil {
 			t.Error(err)
@@ -147,8 +144,7 @@ func Test2_3Majority(t *testing.T) {

 	// 8th validator voted for nil.
 	{
-		addr := privValidators[7].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 7)
+		vote := withValidator(voteProto, privValidators[7].GetAddress(), 7)
 		_, err := signAddVote(privValidators[7], vote, voteSet)
 		if err != nil {
 			t.Error(err)
@@ -180,8 +176,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 66 out of 100 voted for nil.
 	for i := 0; i < 66; i++ {
-		addr := privValidators[i].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, i)
+		vote := withValidator(voteProto, privValidators[i].GetAddress(), i)
 		_, err := signAddVote(privValidators[i], vote, voteSet)
 		if err != nil {
 			t.Error(err)
@@ -194,8 +189,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 67th validator voted for nil
 	{
-		adrr := privValidators[66].GetPubKey().Address()
-		vote := withValidator(voteProto, adrr, 66)
+		vote := withValidator(voteProto, privValidators[66].GetAddress(), 66)
 		_, err := signAddVote(privValidators[66], withBlockHash(vote, nil), voteSet)
 		if err != nil {
 			t.Error(err)
@@ -208,8 +202,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 68th validator voted for a different BlockParts PartSetHeader
 	{
-		addr := privValidators[67].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 67)
+		vote := withValidator(voteProto, privValidators[67].GetAddress(), 67)
 		blockPartsHeader := PartSetHeader{blockPartsTotal, crypto.CRandBytes(32)}
 		_, err := signAddVote(privValidators[67], withBlockPartsHeader(vote, blockPartsHeader), voteSet)
 		if err != nil {
@@ -223,8 +216,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 69th validator voted for different BlockParts Total
 	{
-		addr := privValidators[68].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 68)
+		vote := withValidator(voteProto, privValidators[68].GetAddress(), 68)
 		blockPartsHeader := PartSetHeader{blockPartsTotal + 1, blockPartsHeader.Hash}
 		_, err := signAddVote(privValidators[68], withBlockPartsHeader(vote, blockPartsHeader), voteSet)
 		if err != nil {
@@ -238,8 +230,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 70th validator voted for different BlockHash
 	{
-		addr := privValidators[69].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 69)
+		vote := withValidator(voteProto, privValidators[69].GetAddress(), 69)
 		_, err := signAddVote(privValidators[69], withBlockHash(vote, cmn.RandBytes(32)), voteSet)
 		if err != nil {
 			t.Error(err)
@@ -252,8 +243,7 @@ func Test2_3MajorityRedux(t *testing.T) {

 	// 71st validator voted for the right BlockHash & BlockPartsHeader
 	{
-		addr := privValidators[70].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 70)
+		vote := withValidator(voteProto, privValidators[70].GetAddress(), 70)
 		_, err := signAddVote(privValidators[70], vote, voteSet)
 		if err != nil {
 			t.Error(err)
@@ -281,8 +271,7 @@ func TestBadVotes(t *testing.T) {

 	// val0 votes for nil.
 	{
-		addr := privValidators[0].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], vote, voteSet)
 		if !added || err != nil {
 			t.Errorf("Expected VoteSet.Add to succeed")
@@ -291,8 +280,7 @@ func TestBadVotes(t *testing.T) {

 	// val0 votes again for some block.
 	{
-		addr := privValidators[0].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], withBlockHash(vote, cmn.RandBytes(32)), voteSet)
 		if added || err == nil {
 			t.Errorf("Expected VoteSet.Add to fail, conflicting vote.")
@@ -301,8 +289,7 @@ func TestBadVotes(t *testing.T) {

 	// val1 votes on another height
 	{
-		addr := privValidators[1].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 1)
+		vote := withValidator(voteProto, privValidators[1].GetAddress(), 1)
 		added, err := signAddVote(privValidators[1], withHeight(vote, height+1), voteSet)
 		if added || err == nil {
 			t.Errorf("Expected VoteSet.Add to fail, wrong height")
@@ -311,8 +298,7 @@ func TestBadVotes(t *testing.T) {

 	// val2 votes on another round
 	{
-		addr := privValidators[2].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 2)
+		vote := withValidator(voteProto, privValidators[2].GetAddress(), 2)
 		added, err := signAddVote(privValidators[2], withRound(vote, round+1), voteSet)
 		if added || err == nil {
 			t.Errorf("Expected VoteSet.Add to fail, wrong round")
@@ -321,8 +307,7 @@ func TestBadVotes(t *testing.T) {

 	// val3 votes of another type.
 	{
-		addr := privValidators[3].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 3)
+		vote := withValidator(voteProto, privValidators[3].GetAddress(), 3)
 		added, err := signAddVote(privValidators[3], withType(vote, byte(PrecommitType)), voteSet)
 		if added || err == nil {
 			t.Errorf("Expected VoteSet.Add to fail, wrong type")
@@ -346,10 +331,9 @@ func TestConflicts(t *testing.T) {
 		BlockID:          BlockID{nil, PartSetHeader{}},
 	}

-	val0Addr := privValidators[0].GetPubKey().Address()
 	// val0 votes for nil.
 	{
-		vote := withValidator(voteProto, val0Addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], vote, voteSet)
 		if !added || err != nil {
 			t.Errorf("Expected VoteSet.Add to succeed")
@@ -358,7 +342,7 @@ func TestConflicts(t *testing.T) {

 	// val0 votes again for blockHash1.
 	{
-		vote := withValidator(voteProto, val0Addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], withBlockHash(vote, blockHash1), voteSet)
 		if added {
 			t.Errorf("Expected VoteSet.Add to fail, conflicting vote.")
@@ -373,7 +357,7 @@ func TestConflicts(t *testing.T) {

 	// val0 votes again for blockHash1.
 	{
-		vote := withValidator(voteProto, val0Addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], withBlockHash(vote, blockHash1), voteSet)
 		if !added {
 			t.Errorf("Expected VoteSet.Add to succeed, called SetPeerMaj23().")
@@ -388,7 +372,7 @@ func TestConflicts(t *testing.T) {

 	// val0 votes again for blockHash1.
 	{
-		vote := withValidator(voteProto, val0Addr, 0)
+		vote := withValidator(voteProto, privValidators[0].GetAddress(), 0)
 		added, err := signAddVote(privValidators[0], withBlockHash(vote, blockHash2), voteSet)
 		if added {
 			t.Errorf("Expected VoteSet.Add to fail, duplicate SetPeerMaj23() from peerA")
@@ -400,8 +384,7 @@ func TestConflicts(t *testing.T) {

 	// val1 votes for blockHash1.
 	{
-		addr := privValidators[1].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 1)
+		vote := withValidator(voteProto, privValidators[1].GetAddress(), 1)
 		added, err := signAddVote(privValidators[1], withBlockHash(vote, blockHash1), voteSet)
 		if !added || err != nil {
 			t.Errorf("Expected VoteSet.Add to succeed")
@@ -418,8 +401,7 @@ func TestConflicts(t *testing.T) {

 	// val2 votes for blockHash2.
 	{
-		addr := privValidators[2].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 2)
+		vote := withValidator(voteProto, privValidators[2].GetAddress(), 2)
 		added, err := signAddVote(privValidators[2], withBlockHash(vote, blockHash2), voteSet)
 		if !added || err != nil {
 			t.Errorf("Expected VoteSet.Add to succeed")
@@ -439,8 +421,7 @@ func TestConflicts(t *testing.T) {

 	// val2 votes for blockHash1.
 	{
-		addr := privValidators[2].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 2)
+		vote := withValidator(voteProto, privValidators[2].GetAddress(), 2)
 		added, err := signAddVote(privValidators[2], withBlockHash(vote, blockHash1), voteSet)
 		if !added {
 			t.Errorf("Expected VoteSet.Add to succeed")
@@ -481,8 +462,7 @@ func TestMakeCommit(t *testing.T) {

 	// 6 out of 10 voted for some block.
 	for i := 0; i < 6; i++ {
-		addr := privValidators[i].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, i)
+		vote := withValidator(voteProto, privValidators[i].GetAddress(), i)
 		_, err := signAddVote(privValidators[i], vote, voteSet)
 		if err != nil {
 			t.Error(err)
@@ -494,8 +474,7 @@ func TestMakeCommit(t *testing.T) {

 	// 7th voted for some other block.
 	{
-		addr := privValidators[6].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 6)
+		vote := withValidator(voteProto, privValidators[6].GetAddress(), 6)
 		vote = withBlockHash(vote, cmn.RandBytes(32))
 		vote = withBlockPartsHeader(vote, PartSetHeader{123, cmn.RandBytes(32)})

@@ -507,8 +486,7 @@ func TestMakeCommit(t *testing.T) {

 	// The 8th voted like everyone else.
 	{
-		addr := privValidators[7].GetPubKey().Address()
-		vote := withValidator(voteProto, addr, 7)
+		vote := withValidator(voteProto, privValidators[7].GetAddress(), 7)
 		_, err := signAddVote(privValidators[7], vote, voteSet)
 		if err != nil {
 			t.Error(err)