From 5dab01e8b99715a7469b400746aa0dc27ddcbb1d Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@matrix.org>
Date: Wed, 20 Sep 2017 13:42:05 +0100
Subject: [PATCH] Add 'unused' lint

---
 linter.json                                      |  3 ++-
 .../auth/storage/accounts/membership_table.go    | 16 ----------------
 .../cmd/syncserver-integration-tests/testdata.go |  9 ---------
 .../roomserver/storage/event_state_keys_table.go | 15 ---------------
 4 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/linter.json b/linter.json
index f8da97782..9687b4834 100644
--- a/linter.json
+++ b/linter.json
@@ -16,6 +16,7 @@
         "misspell",
         "unparam",
         "errcheck",
-        "vet"
+        "vet",
+        "unused"
     ]
 }
diff --git a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go
index 11cecb8b6..1a0d0fedf 100644
--- a/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go
+++ b/src/github.com/matrix-org/dendrite/clientapi/auth/storage/accounts/membership_table.go
@@ -51,14 +51,10 @@ const selectMembershipsByLocalpartSQL = "" +
 const deleteMembershipsByEventIDsSQL = "" +
 	"DELETE FROM account_memberships WHERE event_id = ANY($1)"
 
-const updateMembershipByEventIDSQL = "" +
-	"UPDATE account_memberships SET event_id = $2 WHERE event_id = $1"
-
 type membershipStatements struct {
 	deleteMembershipsByEventIDsStmt  *sql.Stmt
 	insertMembershipStmt             *sql.Stmt
 	selectMembershipsByLocalpartStmt *sql.Stmt
-	updateMembershipByEventIDStmt    *sql.Stmt
 }
 
 func (s *membershipStatements) prepare(db *sql.DB) (err error) {
@@ -75,9 +71,6 @@ func (s *membershipStatements) prepare(db *sql.DB) (err error) {
 	if s.selectMembershipsByLocalpartStmt, err = db.Prepare(selectMembershipsByLocalpartSQL); err != nil {
 		return
 	}
-	if s.updateMembershipByEventIDStmt, err = db.Prepare(updateMembershipByEventIDSQL); err != nil {
-		return
-	}
 	return
 }
 
@@ -120,12 +113,3 @@ func (s *membershipStatements) selectMembershipsByLocalpart(
 
 	return
 }
-
-func (s *membershipStatements) updateMembershipByEventID(
-	ctx context.Context, oldEventID string, newEventID string,
-) (err error) {
-	_, err = s.updateMembershipByEventIDStmt.ExecContext(
-		ctx, oldEventID, newEventID,
-	)
-	return
-}
diff --git a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go b/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go
index dfbcc6a5d..5316c587c 100644
--- a/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go
+++ b/src/github.com/matrix-org/dendrite/cmd/syncserver-integration-tests/testdata.go
@@ -35,15 +35,6 @@ const (
 	i16StateAliceKickCharlie
 	i17BobMsg
 	i18StateAliceRoomName
-	i19BobMsg
-	i20StateBobLeave
-	i21AliceMsg
-	i22StateAliceInviteBob
-	i23StateBobRejectInvite
-	i24AliceMsg
-	i25StateAliceRoomName
-	i26StateCharlieJoin
-	i27CharlieMsg
 )
 
 var outputRoomEventTestData = []string{
diff --git a/src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go b/src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go
index 0bf711323..21fe0c104 100644
--- a/src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go
+++ b/src/github.com/matrix-org/dendrite/roomserver/storage/event_state_keys_table.go
@@ -60,10 +60,6 @@ const bulkSelectEventStateKeyNIDSQL = "" +
 	"SELECT event_state_key, event_state_key_nid FROM roomserver_event_state_keys" +
 	" WHERE event_state_key = ANY($1)"
 
-const selectEventStateKeySQL = "" +
-	"SELECT event_state_key FROM roomserver_event_state_keys" +
-	" WHERE event_state_key_nid = $1"
-
 // Bulk lookup from numeric ID to string state key for that state key.
 // Takes an array of strings as the query parameter.
 const bulkSelectEventStateKeySQL = "" +
@@ -73,7 +69,6 @@ const bulkSelectEventStateKeySQL = "" +
 type eventStateKeyStatements struct {
 	insertEventStateKeyNIDStmt     *sql.Stmt
 	selectEventStateKeyNIDStmt     *sql.Stmt
-	selectEventStateKeyStmt        *sql.Stmt
 	bulkSelectEventStateKeyNIDStmt *sql.Stmt
 	bulkSelectEventStateKeyStmt    *sql.Stmt
 }
@@ -86,7 +81,6 @@ func (s *eventStateKeyStatements) prepare(db *sql.DB) (err error) {
 	return statementList{
 		{&s.insertEventStateKeyNIDStmt, insertEventStateKeyNIDSQL},
 		{&s.selectEventStateKeyNIDStmt, selectEventStateKeyNIDSQL},
-		{&s.selectEventStateKeyStmt, selectEventStateKeySQL},
 		{&s.bulkSelectEventStateKeyNIDStmt, bulkSelectEventStateKeyNIDSQL},
 		{&s.bulkSelectEventStateKeyStmt, bulkSelectEventStateKeySQL},
 	}.prepare(db)
@@ -133,15 +127,6 @@ func (s *eventStateKeyStatements) bulkSelectEventStateKeyNID(
 	return result, nil
 }
 
-func (s *eventStateKeyStatements) selectEventStateKey(
-	ctx context.Context, txn *sql.Tx, eventStateKeyNID types.EventStateKeyNID,
-) (string, error) {
-	var eventStateKey string
-	stmt := common.TxStmt(txn, s.selectEventStateKeyStmt)
-	err := stmt.QueryRowContext(ctx, eventStateKeyNID).Scan(&eventStateKey)
-	return eventStateKey, err
-}
-
 func (s *eventStateKeyStatements) bulkSelectEventStateKey(
 	ctx context.Context, eventStateKeyNIDs []types.EventStateKeyNID,
 ) (map[types.EventStateKeyNID]string, error) {