Remove unused code and fix error handling

store/store.go

@@ -167,7 +167,6 @@ type Store struct {
 	observerDone      chan struct{}
 	observerChan      chan raft.Observation
 	observer          *raft.Observer
-	observerWg        sync.WaitGroup
 
 	onDiskCreated        bool      // On disk database actually created?
 	snapsExistOnOpen     bool      // Any snaps present when store opens?
@@ -1442,13 +1441,6 @@ func (s *Store) logSize() (int64, error) {
 	return fi.Size(), nil
 }
 
-func (s *Store) databaseTypePretty() string {
-	if s.dbConf.Memory {
-		return "in-memory"
-	}
-	return "on-disk"
-}
-
 type fsmSnapshot struct {
 	startT time.Time
 	logger *log.Logger
@@ -1613,7 +1605,7 @@ func RecoverNode(dataDir string, logger *log.Logger, logs raft.LogStore, stable
 	// Now, create an in-memory database for temporary use, so we can generate new
 	// snapshots later.
 	var db *sql.DB
-	if b == nil || len(b) == 0 {
+	if len(b) == 0 {
 		db, err = sql.OpenInMemory(false)
 	} else {
 		db, err = sql.DeserializeIntoMemory(b, false)
@@ -1822,7 +1814,7 @@ func checkRaftConfiguration(configuration raft.Configuration) error {
 // createInMemory returns an in-memory database. If b is non-nil and non-empty,
 // then the database will be initialized with the contents of b.
 func createInMemory(b []byte, fkConstraints bool) (db *sql.DB, err error) {
-	if b == nil || len(b) == 0 {
+	if len(b) == 0 {
 		db, err = sql.OpenInMemory(fkConstraints)
 	} else {
 		db, err = sql.DeserializeIntoMemory(b, fkConstraints)

store/store_test.go

@@ -429,7 +429,7 @@ func Test_SingleNodeInMemFK(t *testing.T) {
 		t.Fatalf("failed to execute on single node: %s", err.Error())
 	}
 
-	res, err := s.Execute(executeRequestFromString("INSERT INTO bar(fooid) VALUES(1)", false, false))
+	res, _ := s.Execute(executeRequestFromString("INSERT INTO bar(fooid) VALUES(1)", false, false))
 	if got, exp := asJSON(res), `[{"error":"FOREIGN KEY constraint failed"}]`; exp != got {
 		t.Fatalf("unexpected results for execute\nexp: %s\ngot: %s", exp, got)
 	}
@@ -509,6 +509,9 @@ COMMIT;
 	}
 
 	f, err := ioutil.TempFile("", "rqlite-baktest-")
+	if err != nil {
+		t.Fatalf("Backup Failed: unable to create temp file, %s", err.Error())
+	}
 	defer os.Remove(f.Name())
 	t.Logf("backup file is %s", f.Name())
 
@@ -562,6 +565,9 @@ COMMIT;
 	}
 
 	f, err := ioutil.TempFile("", "rqlite-baktest-")
+	if err != nil {
+		t.Fatalf("Backup Failed: unable to create temp file, %s", err.Error())
+	}
 	defer os.Remove(f.Name())
 	s.logger.Printf("backup file is %s", f.Name())
 
@@ -2165,10 +2171,6 @@ func (m *mockSnapshotSink) Cancel() error {
 	return nil
 }
 
-type mockTransport struct {
-	ln net.Listener
-}
-
 type mockListener struct {
 	ln net.Listener
 }