From 9242997ae733f8d6a011a792e1abaa091d17fd67 Mon Sep 17 00:00:00 2001
From: Maximilian Seifert <max.seifert@drglitch.net>
Date: Wed, 27 Mar 2019 20:08:13 +0100
Subject: [PATCH] Cleanup code according to lint

Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
---
 clientapi/auth/storage/devices/storage_test.go   | 11 +++++------
 syncapi/storage/output_room_events_table_test.go | 14 ++++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/clientapi/auth/storage/devices/storage_test.go b/clientapi/auth/storage/devices/storage_test.go
index f8ab01feb..550d666ec 100644
--- a/clientapi/auth/storage/devices/storage_test.go
+++ b/clientapi/auth/storage/devices/storage_test.go
@@ -38,7 +38,7 @@ func init() {
 
 type deviceSpec struct {
 	localPart   string
-	devId       string
+	devID       string
 	accessToken string
 	displayName string
 }
@@ -49,7 +49,7 @@ func TestDatabase_GetDevicesByLocalpart(t *testing.T) {
 
 	devSpec := deviceSpec{
 		localPart:   "get-device-test-local-part",
-		devId:       "get-device-test-device-id",
+		devID:       "get-device-test-device-id",
 		accessToken: "get-device-test-access-token",
 		displayName: "get-device-test-display-name",
 	}
@@ -69,7 +69,7 @@ func TestDatabase_GetDevicesByLocalpart(t *testing.T) {
 func TestDatabase_CreateDevice(t *testing.T) {
 	devSpec := deviceSpec{
 		localPart:   "create-test-local-part",
-		devId:       "create-test-device-id",
+		devID:       "create-test-device-id",
 		accessToken: "create-test-access-token",
 		displayName: "create-test-display-name",
 	}
@@ -89,16 +89,15 @@ func createTestDevice(devSpecScheme *deviceSpec, count int) (devices []*authtype
 	}
 
 	for i := 0; i < count; i++ {
-		devId := fmt.Sprintf("%s%d", devSpecScheme.devId, i)
+		devID := fmt.Sprintf("%s%d", devSpecScheme.devID, i)
 		displayName := fmt.Sprintf("%s%d", devSpecScheme.displayName, i)
 		if device, err := db.CreateDevice(
 			context.Background(),
 			fmt.Sprintf("%s%d", devSpecScheme.localPart, i),
-			&devId,
+			&devID,
 			fmt.Sprintf("%s%d", devSpecScheme.accessToken, i),
 			&displayName); err != nil {
 			fmt.Println(err)
-			return nil, err
 		} else {
 			devices = append(devices, device)
 		}
diff --git a/syncapi/storage/output_room_events_table_test.go b/syncapi/storage/output_room_events_table_test.go
index 589e2c041..0c4636930 100644
--- a/syncapi/storage/output_room_events_table_test.go
+++ b/syncapi/storage/output_room_events_table_test.go
@@ -37,7 +37,7 @@ func init() {
 	}
 }
 
-const testEventId = "test-event-id"
+const testEventID = "test-event-id"
 
 func Test_sanityCheckOutputRoomEvents(t *testing.T) {
 	db, err := NewSyncServerDatabase(dataSource)
@@ -58,8 +58,9 @@ func TestSyncServerDatabase_selectEventsWithEventIDs(t *testing.T) {
 	insertTestEvent(t, db)
 	ctx := context.Background()
 	txn, err := db.db.Begin()
+	assert.Nil(t, err)
 
-	var eventIDs = []string{testEventId}
+	var eventIDs = []string{testEventID}
 	events, err := db.fetchMissingStateEvents(ctx, txn, eventIDs)
 	assert.Nil(t, err)
 	assert.NotNil(t, events)
@@ -79,17 +80,18 @@ func insertTestEvent(t *testing.T, db *SyncServerDatabase) {
 		Content: []byte(`{"RawContent": "test-raw-content"}`),
 	}
 	event, err := eventBuilder.Build(
-		testEventId,
+		testEventID,
 		time.Now(),
 		"test-server-name",
 		"test-key-id",
 		keyBytes)
 
+	assert.Nil(t, err)
 
 	var addState, removeState []string
 	transactionID := api.TransactionID{
-		DeviceID: "test-device-id",
-		TransactionID:"test-transaction-id",
+		DeviceID:      "test-device-id",
+		TransactionID: "test-transaction-id",
 	}
 
 	newEventID, err := db.events.insertEvent(
@@ -112,7 +114,7 @@ func insertTestEvent(t *testing.T, db *SyncServerDatabase) {
 func selectTestEvent(t *testing.T, db *SyncServerDatabase) {
 	ctx := context.Background()
 
-	var eventIDs = []string{testEventId}
+	var eventIDs = []string{testEventID}
 	res, err := db.Events(ctx, eventIDs)
 	assert.Nil(t, err)
 	assert.NotNil(t, res)