From 0bb2c2c4183f945bad7a0ae4166fc439486da20f Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 1 Sep 2020 00:24:23 +0300
Subject: [PATCH] remove unnecessary txn for SelectPeeks

---
 syncapi/storage/shared/syncserver.go   | 6 +++---
 syncapi/storage/sqlite3/peeks_table.go | 4 ++--
 syncapi/storage/tables/interface.go    | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/syncapi/storage/shared/syncserver.go b/syncapi/storage/shared/syncserver.go
index d8ae455eb..d56931394 100644
--- a/syncapi/storage/shared/syncserver.go
+++ b/syncapi/storage/shared/syncserver.go
@@ -695,7 +695,7 @@ func (d *Database) getResponseWithPDUsForCompleteSync(
 	}
 
 	// Add peeked rooms.
-	peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, deviceID)
+	peeks, err := d.Peeks.SelectPeeks(ctx, userID, deviceID)
 	if err != nil {
 		return
 	}
@@ -1026,7 +1026,7 @@ func (d *Database) getStateDeltas(
 
 	// find out which rooms this user is peeking, if any.
 	// We do this before joins so joins overwrite peeks
-	peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, device.ID)
+	peeks, err := d.Peeks.SelectPeeks(ctx, userID, device.ID)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -1128,7 +1128,7 @@ func (d *Database) getStateDeltasForFullStateSync(
 		return nil, nil, err
 	}
 
-	peeks, err := d.Peeks.SelectPeeks(ctx, txn, userID, device.ID)
+	peeks, err := d.Peeks.SelectPeeks(ctx, userID, device.ID)
 	if err != nil {
 		return nil, nil, err
 	}
diff --git a/syncapi/storage/sqlite3/peeks_table.go b/syncapi/storage/sqlite3/peeks_table.go
index c013a6350..8fb74341b 100644
--- a/syncapi/storage/sqlite3/peeks_table.go
+++ b/syncapi/storage/sqlite3/peeks_table.go
@@ -136,9 +136,9 @@ func (s *peekStatements) DeletePeeks(
 }
 
 func (s *peekStatements) SelectPeeks(
-	ctx context.Context, txn *sql.Tx, userID, deviceID string,
+	ctx context.Context, userID, deviceID string,
 ) (peeks []types.Peek, err error) {
-	rows, err := sqlutil.TxStmt(txn, s.selectPeeksStmt).QueryContext(ctx, userID, deviceID)
+	rows, err := s.selectPeeksStmt.QueryContext(ctx, userID, deviceID)
 	if err != nil {
 		return
 	}
diff --git a/syncapi/storage/tables/interface.go b/syncapi/storage/tables/interface.go
index 3c6ee4bbc..181d7b960 100644
--- a/syncapi/storage/tables/interface.go
+++ b/syncapi/storage/tables/interface.go
@@ -43,7 +43,7 @@ type Peeks interface {
 	InsertPeek(ctx context.Context, txn *sql.Tx, roomID, userID, deviceID string) (streamPos types.StreamPosition, err error)
 	DeletePeek(ctx context.Context, txn *sql.Tx, roomID, userID, deviceID string) (streamPos types.StreamPosition, err error)
 	DeletePeeks(ctx context.Context, txn *sql.Tx, roomID, userID string) (streamPos types.StreamPosition, err error)
-	SelectPeeks(ctxt context.Context, txn *sql.Tx, userID, deviceID string) (peeks []types.Peek, err error)
+	SelectPeeks(ctxt context.Context, userID, deviceID string) (peeks []types.Peek, err error)
 	SelectPeekingDevices(ctxt context.Context) (peekingDevices map[string][]types.PeekingDevice, err error)
 	MarkPeeksAsOld(ctxt context.Context, txn *sql.Tx, userID, deviceID string) (err error)
 }