From 1ecd40082e9ef8764638b20639eaa1da645fb7c1 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Tue, 18 Aug 2020 17:48:05 +0100 Subject: [PATCH] Linter fixes --- roomserver/storage/shared/room_recent_events_updater.go | 2 +- roomserver/storage/sqlite3/state_block_table.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roomserver/storage/shared/room_recent_events_updater.go b/roomserver/storage/shared/room_recent_events_updater.go index 9b7611d49..aa50c67fe 100644 --- a/roomserver/storage/shared/room_recent_events_updater.go +++ b/roomserver/storage/shared/room_recent_events_updater.go @@ -41,7 +41,7 @@ func NewRoomRecentEventsUpdater(d *Database, ctx context.Context, roomNID types. var txn *sql.Tx cancel := func() error { return nil } if useTxns { - txn, err := d.DB.Begin() + txn, err = d.DB.Begin() if err != nil { return nil, nil, fmt.Errorf("d.DB.Begin: %w", err) } diff --git a/roomserver/storage/sqlite3/state_block_table.go b/roomserver/storage/sqlite3/state_block_table.go index 925e9947c..8033903f5 100644 --- a/roomserver/storage/sqlite3/state_block_table.go +++ b/roomserver/storage/sqlite3/state_block_table.go @@ -110,7 +110,7 @@ func (s *stateBlockStatements) BulkInsertStateData( return 0, err } for _, entry := range entries { - _, err := txn.Stmt(s.insertStateDataStmt).ExecContext( + _, err = txn.Stmt(s.insertStateDataStmt).ExecContext( ctx, int64(stateBlockNID), int64(entry.EventTypeNID),