From 5f421617502cee75a33225b054efb747041b8d9c Mon Sep 17 00:00:00 2001
From: Wine93 <wine93.info@gmail.com>
Date: Fri, 23 Aug 2019 01:44:49 +0000
Subject: [PATCH] raft: fixed some typos and simplify minor logic

---
 raft/log_test.go     | 8 ++++----
 raft/raft.go         | 4 ++--
 raft/storage_test.go | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/raft/log_test.go b/raft/log_test.go
index a9ee6ce06..c51310bd8 100644
--- a/raft/log_test.go
+++ b/raft/log_test.go
@@ -265,7 +265,7 @@ func TestLogMaybeAppend(t *testing.T) {
 					t.Fatalf("unexpected error %v", err)
 				}
 				if !reflect.DeepEqual(tt.ents, gents) {
-					t.Errorf("%d: appended entries = %v, want %v", i, gents, tt.ents)
+					t.Errorf("#%d: appended entries = %v, want %v", i, gents, tt.ents)
 				}
 			}
 		}()
@@ -671,13 +671,13 @@ func TestIsOutOfBounds(t *testing.T) {
 			}()
 			err := l.mustCheckOutOfBounds(tt.lo, tt.hi)
 			if tt.wpanic {
-				t.Errorf("%d: panic = %v, want %v", i, false, true)
+				t.Errorf("#%d: panic = %v, want %v", i, false, true)
 			}
 			if tt.wErrCompacted && err != ErrCompacted {
-				t.Errorf("%d: err = %v, want %v", i, err, ErrCompacted)
+				t.Errorf("#%d: err = %v, want %v", i, err, ErrCompacted)
 			}
 			if !tt.wErrCompacted && err != nil {
-				t.Errorf("%d: unexpected err %v", i, err)
+				t.Errorf("#%d: unexpected err %v", i, err)
 			}
 		}()
 	}
diff --git a/raft/raft.go b/raft/raft.go
index 54a8192ce..cdcb43d3f 100644
--- a/raft/raft.go
+++ b/raft/raft.go
@@ -367,7 +367,7 @@ func newRaft(c *Config) *raft {
 	}
 	assertConfStatesEquivalent(r.logger, cs, r.switchToConfig(cfg, prs))
 
-	if !isHardStateEqual(hs, emptyState) {
+	if !IsEmptyHardState(hs) {
 		r.loadState(hs)
 	}
 	if c.Applied > 0 {
@@ -1099,7 +1099,7 @@ func stepLeader(r *raft, m pb.Message) error {
 			case ReadOnlyLeaseBased:
 				ri := r.raftLog.committed
 				if m.From == None || m.From == r.id { // from local member
-					r.readStates = append(r.readStates, ReadState{Index: r.raftLog.committed, RequestCtx: m.Entries[0].Data})
+					r.readStates = append(r.readStates, ReadState{Index: ri, RequestCtx: m.Entries[0].Data})
 				} else {
 					r.send(pb.Message{To: m.From, Type: pb.MsgReadIndexResp, Index: ri, Entries: m.Entries})
 				}
diff --git a/raft/storage_test.go b/raft/storage_test.go
index a4759e024..556379515 100644
--- a/raft/storage_test.go
+++ b/raft/storage_test.go
@@ -106,7 +106,7 @@ func TestStorageLastIndex(t *testing.T) {
 		t.Errorf("err = %v, want nil", err)
 	}
 	if last != 5 {
-		t.Errorf("term = %d, want %d", last, 5)
+		t.Errorf("last = %d, want %d", last, 5)
 	}
 
 	s.Append([]pb.Entry{{Index: 6, Term: 5}})
@@ -115,7 +115,7 @@ func TestStorageLastIndex(t *testing.T) {
 		t.Errorf("err = %v, want nil", err)
 	}
 	if last != 6 {
-		t.Errorf("last = %d, want %d", last, 5)
+		t.Errorf("last = %d, want %d", last, 6)
 	}
 }