From f1f8fc4228f31d67a7afccda669bb5bff1d33eab Mon Sep 17 00:00:00 2001
From: Blake Mizerany <blake.mizerany@gmail.com>
Date: Fri, 22 Aug 2014 14:35:05 -0700
Subject: [PATCH] raft: sm.vote -> State.Vote

---
 raft2/raft.go      | 11 ++++-------
 raft2/raft_test.go |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/raft2/raft.go b/raft2/raft.go
index 6c5197526..0c6de518e 100644
--- a/raft2/raft.go
+++ b/raft2/raft.go
@@ -141,9 +141,6 @@ type raft struct {
 	// the term we are participating in at any time
 	index atomicInt
 
-	// who we voted for in term
-	vote int64
-
 	// the log
 	raftLog *raftLog
 
@@ -191,7 +188,7 @@ func (sm *raft) String() string {
 	s := fmt.Sprintf(`state=%v term=%d`, sm.state, sm.Term)
 	switch sm.state {
 	case stateFollower:
-		s += fmt.Sprintf(" vote=%v lead=%v", sm.vote, sm.lead)
+		s += fmt.Sprintf(" vote=%v lead=%v", sm.Vote, sm.lead)
 	case stateCandidate:
 		s += fmt.Sprintf(` votes="%v"`, sm.votes)
 	case stateLeader:
@@ -494,7 +491,7 @@ func stepFollower(sm *raft, m Message) bool {
 	case msgSnap:
 		sm.handleSnapshot(m)
 	case msgVote:
-		if (sm.vote == none || sm.vote == m.From) && sm.raftLog.isUpToDate(m.Index, m.LogTerm) {
+		if (sm.Vote == none || sm.Vote == m.From) && sm.raftLog.isUpToDate(m.Index, m.LogTerm) {
 			sm.setVote(m.From)
 			sm.send(Message{To: m.From, Type: msgVoteResp, Index: sm.raftLog.lastIndex()})
 		} else {
@@ -554,7 +551,7 @@ func (sm *raft) setTerm(term int64) {
 }
 
 func (sm *raft) setVote(vote int64) {
-	sm.vote = vote
+	sm.Vote = vote
 	sm.saveState()
 }
 
@@ -572,7 +569,7 @@ func (sm *raft) deleteIns(id int64) {
 // When there is a term change, vote change or configuration change, raft
 // must call saveState.
 func (sm *raft) saveState() {
-	sm.setState(sm.vote, sm.Term, sm.raftLog.committed)
+	sm.setState(sm.Vote, sm.Term, sm.raftLog.committed)
 }
 
 func (sm *raft) clearState() {
diff --git a/raft2/raft_test.go b/raft2/raft_test.go
index f95602297..97d03b182 100644
--- a/raft2/raft_test.go
+++ b/raft2/raft_test.go
@@ -542,7 +542,7 @@ func TestRecvMsgVote(t *testing.T) {
 	for i, tt := range tests {
 		sm := &raft{
 			state:   tt.state,
-			vote:    tt.voteFor,
+			State:   State{Vote: tt.voteFor},
 			raftLog: &raftLog{ents: []Entry{{}, {Term: 2}, {Term: 2}}},
 		}