mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 03:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup code according to lint

Browse source 
Signed-off-by: Maximilian Seifert <max.seifert@drglitch.net>
This commit is contained in:
Maximilian Seifert 2019-03-27 20:08:13 +01:00
parent 4017ff2871
commit 9242997ae7
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
clientapi/auth/storage/devices/storage_test.go
View file

@ -38,7 +38,7 @@ func init() {
type deviceSpec struct { type deviceSpec struct {
localPart string localPart string
devId string devID string
accessToken string accessToken string
displayName string displayName string
} }
@ -49,7 +49,7 @@ func TestDatabase_GetDevicesByLocalpart(t *testing.T) {
devSpec := deviceSpec{ devSpec := deviceSpec{
localPart: "get-device-test-local-part", localPart: "get-device-test-local-part",
devId: "get-device-test-device-id", devID: "get-device-test-device-id",
accessToken: "get-device-test-access-token", accessToken: "get-device-test-access-token",
displayName: "get-device-test-display-name", displayName: "get-device-test-display-name",
} }
@ -69,7 +69,7 @@ func TestDatabase_GetDevicesByLocalpart(t *testing.T) {
func TestDatabase_CreateDevice(t *testing.T) { func TestDatabase_CreateDevice(t *testing.T) {
devSpec := deviceSpec{ devSpec := deviceSpec{
localPart: "create-test-local-part", localPart: "create-test-local-part",
devId: "create-test-device-id", devID: "create-test-device-id",
accessToken: "create-test-access-token", accessToken: "create-test-access-token",
displayName: "create-test-display-name", displayName: "create-test-display-name",
} }
@ -89,16 +89,15 @@ func createTestDevice(devSpecScheme *deviceSpec, count int) (devices []*authtype
} }
for i := 0; i < count; i++ { 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) displayName := fmt.Sprintf("%s%d", devSpecScheme.displayName, i)
if device, err := db.CreateDevice( if device, err := db.CreateDevice(
context.Background(), context.Background(),
fmt.Sprintf("%s%d", devSpecScheme.localPart, i), fmt.Sprintf("%s%d", devSpecScheme.localPart, i),
&devId, &devID,
fmt.Sprintf("%s%d", devSpecScheme.accessToken, i), fmt.Sprintf("%s%d", devSpecScheme.accessToken, i),
&displayName); err != nil { &displayName); err != nil {
fmt.Println(err) fmt.Println(err)
return nil, err
} else { } else {
devices = append(devices, device) devices = append(devices, device)
} }

14
syncapi/storage/output_room_events_table_test.go
View file

@ -37,7 +37,7 @@ func init() {
} }
} }
const testEventId = "test-event-id" const testEventID = "test-event-id"
func Test_sanityCheckOutputRoomEvents(t *testing.T) { func Test_sanityCheckOutputRoomEvents(t *testing.T) {
db, err := NewSyncServerDatabase(dataSource) db, err := NewSyncServerDatabase(dataSource)
@ -58,8 +58,9 @@ func TestSyncServerDatabase_selectEventsWithEventIDs(t *testing.T) {
insertTestEvent(t, db) insertTestEvent(t, db)
ctx := context.Background() ctx := context.Background()
txn, err := db.db.Begin() txn, err := db.db.Begin()
assert.Nil(t, err)
var eventIDs = []string{testEventId} var eventIDs = []string{testEventID}
events, err := db.fetchMissingStateEvents(ctx, txn, eventIDs) events, err := db.fetchMissingStateEvents(ctx, txn, eventIDs)
assert.Nil(t, err) assert.Nil(t, err)
assert.NotNil(t, events) assert.NotNil(t, events)
@ -79,17 +80,18 @@ func insertTestEvent(t *testing.T, db *SyncServerDatabase) {
Content: []byte(`{"RawContent": "test-raw-content"}`), Content: []byte(`{"RawContent": "test-raw-content"}`),
} }
event, err := eventBuilder.Build( event, err := eventBuilder.Build(
testEventId, testEventID,
time.Now(), time.Now(),
"test-server-name", "test-server-name",
"test-key-id", "test-key-id",
keyBytes) keyBytes)
assert.Nil(t, err)
var addState, removeState []string var addState, removeState []string
transactionID := api.TransactionID{ transactionID := api.TransactionID{
DeviceID: "test-device-id", DeviceID: "test-device-id",
TransactionID:"test-transaction-id", TransactionID: "test-transaction-id",
} }
newEventID, err := db.events.insertEvent( newEventID, err := db.events.insertEvent(
@ -112,7 +114,7 @@ func insertTestEvent(t *testing.T, db *SyncServerDatabase) {
func selectTestEvent(t *testing.T, db *SyncServerDatabase) { func selectTestEvent(t *testing.T, db *SyncServerDatabase) {
ctx := context.Background() ctx := context.Background()
var eventIDs = []string{testEventId} var eventIDs = []string{testEventID}
res, err := db.Events(ctx, eventIDs) res, err := db.Events(ctx, eventIDs)
assert.Nil(t, err) assert.Nil(t, err)
assert.NotNil(t, res) assert.NotNil(t, res)