Some small refactoring

Author: kgantsov

cmd/kvgod/grpc_server/main.go

@@ -8,15 +8,17 @@ import (
 )
 
 const (
-	port = ":50051"
+	port     = ":50051"
+	raftAddr = ":12000"
 )
 
 func main() {
 	log.Info("Creating storage...")
 	dbPath := filepath.Join(".", "data.db")
 	indexPath := filepath.Join(".", "indexes.idx")
+	raftDir := filepath.Join(".", "raft")
 
-	store := server.NewStore(dbPath, indexPath, 4, 100)
+	store := server.NewStore(dbPath, indexPath, 4, 100, raftDir, raftAddr)
 	log.Info("Storage was succesfully created")
 
 	server.ListenAndServGrpc(":50051", store)

cmd/kvgod/main.go

@@ -43,10 +43,8 @@ func main() {
 
 	log.Info("Creating storage...")
 	store := server.NewStore(
-		filepath.Join(*raftDir, dbPath), filepath.Join(*raftDir, indexPath), 1000, 10000,
+		filepath.Join(*raftDir, dbPath), filepath.Join(*raftDir, indexPath), 1000, 10000, *raftDir, *raftAddr,
 	)
-	store.RaftDir = *raftDir
-	store.RaftBind = *raftAddr
 
 	if err := store.Open(*joinAddr == "", *nodeID); err != nil {
 		log.Fatalf("failed to open store: %s", err.Error())

pkg/server/grpc_test.go

@@ -15,6 +15,7 @@ import (
 
 func TestGRPCServerBasic(t *testing.T) {
 	port := ":50051"
+	raftAddr := ":12000"
 	address := "localhost" + port
 
 	tmpDir, _ := ioutil.TempDir("", "kvgo_grpc_tests")
@@ -25,9 +26,7 @@ func TestGRPCServerBasic(t *testing.T) {
 	raftDir := filepath.Join(".", "raft")
 
 	log.Info("Creating storage...")
-	store := NewStore(dbPath, indexPath, 1000, 10000)
-	store.RaftDir = raftDir
-	store.RaftBind = ":12000"
+	store := NewStore(dbPath, indexPath, 1000, 10000, raftDir, raftAddr)
 
 	if err := store.Open(true, "node1"); err != nil {
 		log.Fatalf("failed to open store: %s", err.Error())

pkg/server/server_test.go

@@ -13,6 +13,7 @@ import (
 
 func TestServerBasic(t *testing.T) {
 	port := ":56379"
+	raftAddr := ":12001"
 	tmpDir, _ := ioutil.TempDir("", "kvgo_tests")
 	defer os.RemoveAll(tmpDir)
 
@@ -21,9 +22,7 @@ func TestServerBasic(t *testing.T) {
 	raftDir := filepath.Join(tmpDir, "raft")
 
 	log.Info("Creating storage...")
-	store := NewStore(dbPath, indexPath, 1000, 10000)
-	store.RaftDir = raftDir
-	store.RaftBind = ":12001"
+	store := NewStore(dbPath, indexPath, 1000, 10000, raftDir, raftAddr)
 
 	if err := store.Open(true, "node1"); err != nil {
 		log.Fatalf("failed to open store: %s", err.Error())

pkg/server/store.go

@@ -35,10 +35,13 @@ type command struct {
 	Value string `json:"value,omitempty"`
 }
 
-func NewStore(dbPath, indexPath string, blockSize uint32, maxBlockNumber int16) *Store {
+func NewStore(dbPath, indexPath string, blockSize uint32, maxBlockNumber int16, RaftDir, RaftBind string) *Store {
 	store := new(Store)
 	store.KV = kv.NewKV(dbPath, indexPath, blockSize, maxBlockNumber)
 
+	store.RaftDir = RaftDir
+	store.RaftBind = RaftBind
+
 	return store
 }