raft: rename ConfigAdd/ConfigRemove -> AddNode/RemoveNode

raft/log.go

@@ -3,8 +3,8 @@ package raft
 const (
 	Normal int = iota
 
-	ConfigAdd
-	ConfigRemove
+	AddNode
+	RemoveNode
 )
 
 type Entry struct {

raft/node.go

@@ -56,9 +56,9 @@ func (n *Node) propose(t int, data []byte) {
 	n.Step(Message{Type: msgProp, Entries: []Entry{{Type: t, Data: data}}})
 }
 
-func (n *Node) Add(id int) { n.updateConf(ConfigAdd, &config{NodeId: id}) }
+func (n *Node) Add(id int) { n.updateConf(AddNode, &config{NodeId: id}) }
 
-func (n *Node) Remove(id int) { n.updateConf(ConfigRemove, &config{NodeId: id}) }
+func (n *Node) Remove(id int) { n.updateConf(RemoveNode, &config{NodeId: id}) }
 
 func (n *Node) Msgs() []Message { return n.sm.Msgs() }
 
@@ -88,14 +88,14 @@ func (n *Node) Next() []Entry {
 	for i := range ents {
 		switch ents[i].Type {
 		case Normal:
-		case ConfigAdd:
+		case AddNode:
 			c := new(config)
 			if err := json.Unmarshal(ents[i].Data, c); err != nil {
 				golog.Println(err)
 				continue
 			}
 			n.sm.addNode(c.NodeId)
-		case ConfigRemove:
+		case RemoveNode:
 			c := new(config)
 			if err := json.Unmarshal(ents[i].Data, c); err != nil {
 				golog.Println(err)

raft/raft.go

@@ -227,7 +227,7 @@ func (sm *stateMachine) becomeLeader() {
 	sm.state = stateLeader
 
 	for _, e := range sm.log.ents[sm.log.committed:] {
-		if e.Type == ConfigAdd || e.Type == ConfigRemove {
+		if e.Type == AddNode || e.Type == RemoveNode {
 			sm.pendingConf = true
 		}
 	}
@@ -270,7 +270,7 @@ func (sm *stateMachine) Step(m Message) (ok bool) {
 		switch sm.lead {
 		case sm.id:
 			e := m.Entries[0]
-			if e.Type == ConfigAdd || e.Type == ConfigRemove {
+			if e.Type == AddNode || e.Type == RemoveNode {
 				if sm.pendingConf {
 					return false
 				}

raft/raft_test.go

@@ -497,19 +497,19 @@ func TestConf(t *testing.T) {
 	sm.becomeCandidate()
 	sm.becomeLeader()
 
-	sm.Step(Message{Type: msgProp, Entries: []Entry{{Type: ConfigAdd}}})
+	sm.Step(Message{Type: msgProp, Entries: []Entry{{Type: AddNode}}})
 	if sm.log.lastIndex() != 1 {
 		t.Errorf("lastindex = %d, want %d", sm.log.lastIndex(), 1)
 	}
 	if !sm.pendingConf {
 		t.Errorf("pendingConf = %v, want %v", sm.pendingConf, true)
 	}
-	if sm.log.ents[1].Type != ConfigAdd {
-		t.Errorf("type = %d, want %d", sm.log.ents[1].Type, ConfigAdd)
+	if sm.log.ents[1].Type != AddNode {
+		t.Errorf("type = %d, want %d", sm.log.ents[1].Type, AddNode)
 	}
 
 	// deny the second configuration change request if there is a pending one
-	sm.Step(Message{Type: msgProp, Entries: []Entry{{Type: ConfigAdd}}})
+	sm.Step(Message{Type: msgProp, Entries: []Entry{{Type: AddNode}}})
 	if sm.log.lastIndex() != 1 {
 		t.Errorf("lastindex = %d, want %d", sm.log.lastIndex(), 1)
 	}
@@ -523,8 +523,8 @@ func TestConfChangeLeader(t *testing.T) {
 		wPending bool
 	}{
 		{Normal, false},
-		{ConfigAdd, true},
-		{ConfigRemove, true},
+		{AddNode, true},
+		{RemoveNode, true},
 	}
 
 	for i, tt := range tests {