refactor: update GMSL (#3058)

Sister PR to https://github.com/matrix-org/gomatrixserverlib/pull/364

Read this commit by commit to avoid going insane.

13 files changed, 70 insertions, 67 deletions

diff --git a/federationapi/storage/sqlite3/assumed_offline_table.go b/federationapi/storage/sqlite3/assumed_offline_table.go
index ff2afb4d..f8de7f0c 100644
--- a/federationapi/storage/sqlite3/assumed_offline_table.go
+++ b/federationapi/storage/sqlite3/assumed_offline_table.go
@@ -19,7 +19,7 @@ import (
 	"database/sql"
 
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const assumedOfflineSchema = `
@@ -68,7 +68,7 @@ func NewSQLiteAssumedOfflineTable(db *sql.DB) (s *assumedOfflineStatements, err
 }
 
 func (s *assumedOfflineStatements) InsertAssumedOffline(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.insertAssumedOfflineStmt)
 	_, err := stmt.ExecContext(ctx, serverName)
@@ -76,7 +76,7 @@ func (s *assumedOfflineStatements) InsertAssumedOffline(
 }
 
 func (s *assumedOfflineStatements) SelectAssumedOffline(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) (bool, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectAssumedOfflineStmt)
 	res, err := stmt.QueryContext(ctx, serverName)
@@ -91,7 +91,7 @@ func (s *assumedOfflineStatements) SelectAssumedOffline(
 }
 
 func (s *assumedOfflineStatements) DeleteAssumedOffline(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.deleteAssumedOfflineStmt)
 	_, err := stmt.ExecContext(ctx, serverName)
diff --git a/federationapi/storage/sqlite3/blacklist_table.go b/federationapi/storage/sqlite3/blacklist_table.go
index 5122bff1..2c65c487 100644
--- a/federationapi/storage/sqlite3/blacklist_table.go
+++ b/federationapi/storage/sqlite3/blacklist_table.go
@@ -19,7 +19,7 @@ import (
 	"database/sql"
 
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const blacklistSchema = `
@@ -69,7 +69,7 @@ func NewSQLiteBlacklistTable(db *sql.DB) (s *blacklistStatements, err error) {
 }
 
 func (s *blacklistStatements) InsertBlacklist(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.insertBlacklistStmt)
 	_, err := stmt.ExecContext(ctx, serverName)
@@ -77,7 +77,7 @@ func (s *blacklistStatements) InsertBlacklist(
 }
 
 func (s *blacklistStatements) SelectBlacklist(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) (bool, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectBlacklistStmt)
 	res, err := stmt.QueryContext(ctx, serverName)
@@ -92,7 +92,7 @@ func (s *blacklistStatements) SelectBlacklist(
 }
 
 func (s *blacklistStatements) DeleteBlacklist(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.deleteBlacklistStmt)
 	_, err := stmt.ExecContext(ctx, serverName)
diff --git a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go
index c5030163..d8be4695 100644
--- a/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go
+++ b/federationapi/storage/sqlite3/deltas/2022042812473400_addexpiresat.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 func UpAddexpiresat(ctx context.Context, tx *sql.Tx) error {
@@ -52,7 +52,7 @@ INSERT
 	if err != nil {
 		return fmt.Errorf("failed to update queue_edus: %w", err)
 	}
-	_, err = tx.ExecContext(ctx, "UPDATE federationsender_queue_edus SET expires_at = $1 WHERE edu_type != 'm.direct_to_device'", gomatrixserverlib.AsTimestamp(time.Now().Add(time.Hour*24)))
+	_, err = tx.ExecContext(ctx, "UPDATE federationsender_queue_edus SET expires_at = $1 WHERE edu_type != 'm.direct_to_device'", spec.AsTimestamp(time.Now().Add(time.Hour*24)))
 	if err != nil {
 		return fmt.Errorf("failed to update queue_edus: %w", err)
 	}
diff --git a/federationapi/storage/sqlite3/inbound_peeks_table.go b/federationapi/storage/sqlite3/inbound_peeks_table.go
index 8c356793..e58d5377 100644
--- a/federationapi/storage/sqlite3/inbound_peeks_table.go
+++ b/federationapi/storage/sqlite3/inbound_peeks_table.go
@@ -22,7 +22,7 @@ import (
 	"github.com/matrix-org/dendrite/federationapi/types"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const inboundPeeksSchema = `
@@ -86,7 +86,7 @@ func NewSQLiteInboundPeeksTable(db *sql.DB) (s *inboundPeeksStatements, err erro
 }
 
 func (s *inboundPeeksStatements) InsertInboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, renewalInterval int64,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string, renewalInterval int64,
 ) (err error) {
 	nowMilli := time.Now().UnixNano() / int64(time.Millisecond)
 	stmt := sqlutil.TxStmt(txn, s.insertInboundPeekStmt)
@@ -95,7 +95,7 @@ func (s *inboundPeeksStatements) InsertInboundPeek(
 }
 
 func (s *inboundPeeksStatements) RenewInboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, renewalInterval int64,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string, renewalInterval int64,
 ) (err error) {
 	nowMilli := time.Now().UnixNano() / int64(time.Millisecond)
 	_, err = sqlutil.TxStmt(txn, s.renewInboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID)
@@ -103,7 +103,7 @@ func (s *inboundPeeksStatements) RenewInboundPeek(
 }
 
 func (s *inboundPeeksStatements) SelectInboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string,
 ) (*types.InboundPeek, error) {
 	row := sqlutil.TxStmt(txn, s.selectInboundPeeksStmt).QueryRowContext(ctx, roomID)
 	inboundPeek := types.InboundPeek{}
@@ -152,7 +152,7 @@ func (s *inboundPeeksStatements) SelectInboundPeeks(
 }
 
 func (s *inboundPeeksStatements) DeleteInboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string,
 ) (err error) {
 	_, err = sqlutil.TxStmt(txn, s.deleteInboundPeekStmt).ExecContext(ctx, roomID, serverName, peekID)
 	return
diff --git a/federationapi/storage/sqlite3/joined_hosts_table.go b/federationapi/storage/sqlite3/joined_hosts_table.go
index 2f076382..2412cacd 100644
--- a/federationapi/storage/sqlite3/joined_hosts_table.go
+++ b/federationapi/storage/sqlite3/joined_hosts_table.go
@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/federationapi/types"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const joinedHostsSchema = `
@@ -104,7 +104,7 @@ func (s *joinedHostsStatements) InsertJoinedHosts(
 	ctx context.Context,
 	txn *sql.Tx,
 	roomID, eventID string,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.insertJoinedHostsStmt)
 	_, err := stmt.ExecContext(ctx, roomID, eventID, serverName)
@@ -146,20 +146,20 @@ func (s *joinedHostsStatements) SelectJoinedHosts(
 
 func (s *joinedHostsStatements) SelectAllJoinedHosts(
 	ctx context.Context,
-) ([]gomatrixserverlib.ServerName, error) {
+) ([]spec.ServerName, error) {
 	rows, err := s.selectAllJoinedHostsStmt.QueryContext(ctx)
 	if err != nil {
 		return nil, err
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "selectAllJoinedHosts: rows.close() failed")
 
-	var result []gomatrixserverlib.ServerName
+	var result []spec.ServerName
 	for rows.Next() {
 		var serverName string
 		if err = rows.Scan(&serverName); err != nil {
 			return nil, err
 		}
-		result = append(result, gomatrixserverlib.ServerName(serverName))
+		result = append(result, spec.ServerName(serverName))
 	}
 
 	return result, rows.Err()
@@ -167,7 +167,7 @@ func (s *joinedHostsStatements) SelectAllJoinedHosts(
 
 func (s *joinedHostsStatements) SelectJoinedHostsForRooms(
 	ctx context.Context, roomIDs []string, excludingBlacklisted bool,
-) ([]gomatrixserverlib.ServerName, error) {
+) ([]spec.ServerName, error) {
 	iRoomIDs := make([]interface{}, len(roomIDs))
 	for i := range roomIDs {
 		iRoomIDs[i] = roomIDs[i]
@@ -183,13 +183,13 @@ func (s *joinedHostsStatements) SelectJoinedHostsForRooms(
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "selectJoinedHostsForRoomsStmt: rows.close() failed")
 
-	var result []gomatrixserverlib.ServerName
+	var result []spec.ServerName
 	for rows.Next() {
 		var serverName string
 		if err = rows.Scan(&serverName); err != nil {
 			return nil, err
 		}
-		result = append(result, gomatrixserverlib.ServerName(serverName))
+		result = append(result, spec.ServerName(serverName))
 	}
 
 	return result, rows.Err()
@@ -212,7 +212,7 @@ func joinedHostsFromStmt(
 		}
 		result = append(result, types.JoinedHost{
 			MemberEventID: eventID,
-			ServerName:    gomatrixserverlib.ServerName(serverName),
+			ServerName:    spec.ServerName(serverName),
 		})
 	}
 
diff --git a/federationapi/storage/sqlite3/notary_server_keys_json_table.go b/federationapi/storage/sqlite3/notary_server_keys_json_table.go
index 24875569..ad6d1b57 100644
--- a/federationapi/storage/sqlite3/notary_server_keys_json_table.go
+++ b/federationapi/storage/sqlite3/notary_server_keys_json_table.go
@@ -21,6 +21,7 @@ import (
 	"github.com/matrix-org/dendrite/federationapi/storage/tables"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const notaryServerKeysJSONSchema = `
@@ -56,7 +57,7 @@ func NewSQLiteNotaryServerKeysTable(db *sql.DB) (s *notaryServerKeysStatements,
 }
 
 func (s *notaryServerKeysStatements) InsertJSONResponse(
-	ctx context.Context, txn *sql.Tx, keyQueryResponseJSON gomatrixserverlib.ServerKeys, serverName gomatrixserverlib.ServerName, validUntil gomatrixserverlib.Timestamp,
+	ctx context.Context, txn *sql.Tx, keyQueryResponseJSON gomatrixserverlib.ServerKeys, serverName spec.ServerName, validUntil spec.Timestamp,
 ) (tables.NotaryID, error) {
 	var notaryID tables.NotaryID
 	return notaryID, txn.Stmt(s.insertServerKeysJSONStmt).QueryRowContext(ctx, string(keyQueryResponseJSON.Raw), serverName, validUntil).Scan(&notaryID)
diff --git a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go
index 7179eb8d..2fd9ef21 100644
--- a/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go
+++ b/federationapi/storage/sqlite3/notary_server_keys_metadata_table.go
@@ -25,6 +25,7 @@ import (
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const notaryServerKeysMetadataSchema = `
@@ -101,12 +102,12 @@ func NewSQLiteNotaryServerKeysMetadataTable(db *sql.DB) (s *notaryServerKeysMeta
 }
 
 func (s *notaryServerKeysMetadataStatements) UpsertKey(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, keyID gomatrixserverlib.KeyID, newNotaryID tables.NotaryID, newValidUntil gomatrixserverlib.Timestamp,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, keyID gomatrixserverlib.KeyID, newNotaryID tables.NotaryID, newValidUntil spec.Timestamp,
 ) (tables.NotaryID, error) {
 	notaryID := newNotaryID
 	// see if the existing notary ID a) exists, b) has a longer valid_until
 	var existingNotaryID tables.NotaryID
-	var existingValidUntil gomatrixserverlib.Timestamp
+	var existingValidUntil spec.Timestamp
 	if err := txn.Stmt(s.selectNotaryKeyMetadataStmt).QueryRowContext(ctx, serverName, keyID).Scan(&existingNotaryID, &existingValidUntil); err != nil {
 		if err != sql.ErrNoRows {
 			return 0, err
@@ -121,7 +122,7 @@ func (s *notaryServerKeysMetadataStatements) UpsertKey(
 	return notaryID, err
 }
 
-func (s *notaryServerKeysMetadataStatements) SelectKeys(ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, keyIDs []gomatrixserverlib.KeyID) ([]gomatrixserverlib.ServerKeys, error) {
+func (s *notaryServerKeysMetadataStatements) SelectKeys(ctx context.Context, txn *sql.Tx, serverName spec.ServerName, keyIDs []gomatrixserverlib.KeyID) ([]gomatrixserverlib.ServerKeys, error) {
 	var rows *sql.Rows
 	var err error
 	if len(keyIDs) == 0 {
diff --git a/federationapi/storage/sqlite3/outbound_peeks_table.go b/federationapi/storage/sqlite3/outbound_peeks_table.go
index 33f452b6..b6684e9b 100644
--- a/federationapi/storage/sqlite3/outbound_peeks_table.go
+++ b/federationapi/storage/sqlite3/outbound_peeks_table.go
@@ -22,7 +22,7 @@ import (
 	"github.com/matrix-org/dendrite/federationapi/types"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const outboundPeeksSchema = `
@@ -85,7 +85,7 @@ func NewSQLiteOutboundPeeksTable(db *sql.DB) (s *outboundPeeksStatements, err er
 }
 
 func (s *outboundPeeksStatements) InsertOutboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, renewalInterval int64,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string, renewalInterval int64,
 ) (err error) {
 	nowMilli := time.Now().UnixNano() / int64(time.Millisecond)
 	stmt := sqlutil.TxStmt(txn, s.insertOutboundPeekStmt)
@@ -94,7 +94,7 @@ func (s *outboundPeeksStatements) InsertOutboundPeek(
 }
 
 func (s *outboundPeeksStatements) RenewOutboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string, renewalInterval int64,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string, renewalInterval int64,
 ) (err error) {
 	nowMilli := time.Now().UnixNano() / int64(time.Millisecond)
 	_, err = sqlutil.TxStmt(txn, s.renewOutboundPeekStmt).ExecContext(ctx, nowMilli, renewalInterval, roomID, serverName, peekID)
@@ -102,7 +102,7 @@ func (s *outboundPeeksStatements) RenewOutboundPeek(
 }
 
 func (s *outboundPeeksStatements) SelectOutboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string,
 ) (*types.OutboundPeek, error) {
 	row := sqlutil.TxStmt(txn, s.selectOutboundPeeksStmt).QueryRowContext(ctx, roomID)
 	outboundPeek := types.OutboundPeek{}
@@ -151,7 +151,7 @@ func (s *outboundPeeksStatements) SelectOutboundPeeks(
 }
 
 func (s *outboundPeeksStatements) DeleteOutboundPeek(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName, roomID, peekID string,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName, roomID, peekID string,
 ) (err error) {
 	_, err = sqlutil.TxStmt(txn, s.deleteOutboundPeekStmt).ExecContext(ctx, roomID, serverName, peekID)
 	return
diff --git a/federationapi/storage/sqlite3/queue_edus_table.go b/federationapi/storage/sqlite3/queue_edus_table.go
index 0dc91432..f500a631 100644
--- a/federationapi/storage/sqlite3/queue_edus_table.go
+++ b/federationapi/storage/sqlite3/queue_edus_table.go
@@ -20,11 +20,10 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/matrix-org/gomatrixserverlib"
-
 	"github.com/matrix-org/dendrite/federationapi/storage/sqlite3/deltas"
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const queueEDUsSchema = `
@@ -121,9 +120,9 @@ func (s *queueEDUsStatements) InsertQueueEDU(
 	ctx context.Context,
 	txn *sql.Tx,
 	eduType string,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	nid int64,
-	expiresAt gomatrixserverlib.Timestamp,
+	expiresAt spec.Timestamp,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.insertQueueEDUStmt)
 	_, err := stmt.ExecContext(
@@ -138,7 +137,7 @@ func (s *queueEDUsStatements) InsertQueueEDU(
 
 func (s *queueEDUsStatements) DeleteQueueEDUs(
 	ctx context.Context, txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	jsonNIDs []int64,
 ) error {
 	deleteSQL := strings.Replace(deleteQueueEDUsSQL, "($2)", sqlutil.QueryVariadicOffset(len(jsonNIDs), 1), 1)
@@ -160,7 +159,7 @@ func (s *queueEDUsStatements) DeleteQueueEDUs(
 
 func (s *queueEDUsStatements) SelectQueueEDUs(
 	ctx context.Context, txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	limit int,
 ) ([]int64, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectQueueEDUStmt)
@@ -194,16 +193,16 @@ func (s *queueEDUsStatements) SelectQueueEDUReferenceJSONCount(
 
 func (s *queueEDUsStatements) SelectQueueEDUServerNames(
 	ctx context.Context, txn *sql.Tx,
-) ([]gomatrixserverlib.ServerName, error) {
+) ([]spec.ServerName, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectQueueEDUServerNamesStmt)
 	rows, err := stmt.QueryContext(ctx)
 	if err != nil {
 		return nil, err
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "queueFromStmt: rows.close() failed")
-	var result []gomatrixserverlib.ServerName
+	var result []spec.ServerName
 	for rows.Next() {
-		var serverName gomatrixserverlib.ServerName
+		var serverName spec.ServerName
 		if err = rows.Scan(&serverName); err != nil {
 			return nil, err
 		}
@@ -215,7 +214,7 @@ func (s *queueEDUsStatements) SelectQueueEDUServerNames(
 
 func (s *queueEDUsStatements) SelectExpiredEDUs(
 	ctx context.Context, txn *sql.Tx,
-	expiredBefore gomatrixserverlib.Timestamp,
+	expiredBefore spec.Timestamp,
 ) ([]int64, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectExpiredEDUsStmt)
 	rows, err := stmt.QueryContext(ctx, expiredBefore)
@@ -236,7 +235,7 @@ func (s *queueEDUsStatements) SelectExpiredEDUs(
 
 func (s *queueEDUsStatements) DeleteExpiredEDUs(
 	ctx context.Context, txn *sql.Tx,
-	expiredBefore gomatrixserverlib.Timestamp,
+	expiredBefore spec.Timestamp,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.deleteExpiredEDUsStmt)
 	_, err := stmt.ExecContext(ctx, expiredBefore)
diff --git a/federationapi/storage/sqlite3/queue_pdus_table.go b/federationapi/storage/sqlite3/queue_pdus_table.go
index d8d99f0c..92075ff9 100644
--- a/federationapi/storage/sqlite3/queue_pdus_table.go
+++ b/federationapi/storage/sqlite3/queue_pdus_table.go
@@ -24,6 +24,7 @@ import (
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const queuePDUsSchema = `
@@ -100,7 +101,7 @@ func (s *queuePDUsStatements) InsertQueuePDU(
 	ctx context.Context,
 	txn *sql.Tx,
 	transactionID gomatrixserverlib.TransactionID,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	nid int64,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.insertQueuePDUStmt)
@@ -115,7 +116,7 @@ func (s *queuePDUsStatements) InsertQueuePDU(
 
 func (s *queuePDUsStatements) DeleteQueuePDUs(
 	ctx context.Context, txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	jsonNIDs []int64,
 ) error {
 	deleteSQL := strings.Replace(deleteQueuePDUsSQL, "($2)", sqlutil.QueryVariadicOffset(len(jsonNIDs), 1), 1)
@@ -136,7 +137,7 @@ func (s *queuePDUsStatements) DeleteQueuePDUs(
 }
 
 func (s *queuePDUsStatements) SelectQueuePDUNextTransactionID(
-	ctx context.Context, txn *sql.Tx, serverName gomatrixserverlib.ServerName,
+	ctx context.Context, txn *sql.Tx, serverName spec.ServerName,
 ) (gomatrixserverlib.TransactionID, error) {
 	var transactionID gomatrixserverlib.TransactionID
 	stmt := sqlutil.TxStmt(txn, s.selectQueueNextTransactionIDStmt)
@@ -161,7 +162,7 @@ func (s *queuePDUsStatements) SelectQueuePDUReferenceJSONCount(
 
 func (s *queuePDUsStatements) SelectQueuePDUs(
 	ctx context.Context, txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 	limit int,
 ) ([]int64, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectQueuePDUsStmt)
@@ -184,16 +185,16 @@ func (s *queuePDUsStatements) SelectQueuePDUs(
 
 func (s *queuePDUsStatements) SelectQueuePDUServerNames(
 	ctx context.Context, txn *sql.Tx,
-) ([]gomatrixserverlib.ServerName, error) {
+) ([]spec.ServerName, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectQueueServerNamesStmt)
 	rows, err := stmt.QueryContext(ctx)
 	if err != nil {
 		return nil, err
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "queueFromStmt: rows.close() failed")
-	var result []gomatrixserverlib.ServerName
+	var result []spec.ServerName
 	for rows.Next() {
-		var serverName gomatrixserverlib.ServerName
+		var serverName spec.ServerName
 		if err = rows.Scan(&serverName); err != nil {
 			return nil, err
 		}
diff --git a/federationapi/storage/sqlite3/relay_servers_table.go b/federationapi/storage/sqlite3/relay_servers_table.go
index 27c3cca2..36cabeb4 100644
--- a/federationapi/storage/sqlite3/relay_servers_table.go
+++ b/federationapi/storage/sqlite3/relay_servers_table.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/matrix-org/dendrite/internal"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const relayServersSchema = `
@@ -77,8 +77,8 @@ func NewSQLiteRelayServersTable(db *sql.DB) (s *relayServersStatements, err erro
 func (s *relayServersStatements) InsertRelayServers(
 	ctx context.Context,
 	txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
-	relayServers []gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
+	relayServers []spec.ServerName,
 ) error {
 	for _, relayServer := range relayServers {
 		stmt := sqlutil.TxStmt(txn, s.insertRelayServersStmt)
@@ -92,8 +92,8 @@ func (s *relayServersStatements) InsertRelayServers(
 func (s *relayServersStatements) SelectRelayServers(
 	ctx context.Context,
 	txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
-) ([]gomatrixserverlib.ServerName, error) {
+	serverName spec.ServerName,
+) ([]spec.ServerName, error) {
 	stmt := sqlutil.TxStmt(txn, s.selectRelayServersStmt)
 	rows, err := stmt.QueryContext(ctx, serverName)
 	if err != nil {
@@ -101,13 +101,13 @@ func (s *relayServersStatements) SelectRelayServers(
 	}
 	defer internal.CloseAndLogIfError(ctx, rows, "SelectRelayServers: rows.close() failed")
 
-	var result []gomatrixserverlib.ServerName
+	var result []spec.ServerName
 	for rows.Next() {
 		var relayServer string
 		if err = rows.Scan(&relayServer); err != nil {
 			return nil, err
 		}
-		result = append(result, gomatrixserverlib.ServerName(relayServer))
+		result = append(result, spec.ServerName(relayServer))
 	}
 	return result, nil
 }
@@ -115,8 +115,8 @@ func (s *relayServersStatements) SelectRelayServers(
 func (s *relayServersStatements) DeleteRelayServers(
 	ctx context.Context,
 	txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
-	relayServers []gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
+	relayServers []spec.ServerName,
 ) error {
 	deleteSQL := strings.Replace(deleteRelayServersSQL, "($2)", sqlutil.QueryVariadicOffset(len(relayServers), 1), 1)
 	deleteStmt, err := s.db.Prepare(deleteSQL)
@@ -138,7 +138,7 @@ func (s *relayServersStatements) DeleteRelayServers(
 func (s *relayServersStatements) DeleteAllRelayServers(
 	ctx context.Context,
 	txn *sql.Tx,
-	serverName gomatrixserverlib.ServerName,
+	serverName spec.ServerName,
 ) error {
 	stmt := sqlutil.TxStmt(txn, s.deleteAllRelayServersStmt)
 	if _, err := stmt.ExecContext(ctx, serverName); err != nil {
diff --git a/federationapi/storage/sqlite3/server_key_table.go b/federationapi/storage/sqlite3/server_key_table.go
index b32ff092..f28b8994 100644
--- a/federationapi/storage/sqlite3/server_key_table.go
+++ b/federationapi/storage/sqlite3/server_key_table.go
@@ -22,6 +22,7 @@ import (
 
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 const serverSigningKeysSchema = `
@@ -82,7 +83,7 @@ func NewSQLiteServerSigningKeysTable(db *sql.DB) (s *serverSigningKeyStatements,
 
 func (s *serverSigningKeyStatements) BulkSelectServerKeys(
 	ctx context.Context, txn *sql.Tx,
-	requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
+	requests map[gomatrixserverlib.PublicKeyLookupRequest]spec.Timestamp,
 ) (map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, error) {
 	nameAndKeyIDs := make([]string, 0, len(requests))
 	for request := range requests {
@@ -107,7 +108,7 @@ func (s *serverSigningKeyStatements) BulkSelectServerKeys(
 					return fmt.Errorf("bulkSelectServerKeys: %v", err)
 				}
 				r := gomatrixserverlib.PublicKeyLookupRequest{
-					ServerName: gomatrixserverlib.ServerName(serverName),
+					ServerName: spec.ServerName(serverName),
 					KeyID:      gomatrixserverlib.KeyID(keyID),
 				}
 				vk := gomatrixserverlib.VerifyKey{}
@@ -117,8 +118,8 @@ func (s *serverSigningKeyStatements) BulkSelectServerKeys(
 				}
 				results[r] = gomatrixserverlib.PublicKeyLookupResult{
 					VerifyKey:    vk,
-					ValidUntilTS: gomatrixserverlib.Timestamp(validUntilTS),
-					ExpiredTS:    gomatrixserverlib.Timestamp(expiredTS),
+					ValidUntilTS: spec.Timestamp(validUntilTS),
+					ExpiredTS:    spec.Timestamp(expiredTS),
 				}
 			}
 			return nil
diff --git a/federationapi/storage/sqlite3/storage.go b/federationapi/storage/sqlite3/storage.go
index c64c9a4f..00c8afa0 100644
--- a/federationapi/storage/sqlite3/storage.go
+++ b/federationapi/storage/sqlite3/storage.go
@@ -23,7 +23,7 @@ import (
 	"github.com/matrix-org/dendrite/internal/caching"
 	"github.com/matrix-org/dendrite/internal/sqlutil"
 	"github.com/matrix-org/dendrite/setup/config"
-	"github.com/matrix-org/gomatrixserverlib"
+	"github.com/matrix-org/gomatrixserverlib/spec"
 )
 
 // Database stores information needed by the federation sender
@@ -34,7 +34,7 @@ type Database struct {
 }
 
 // NewDatabase opens a new database
-func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(gomatrixserverlib.ServerName) bool) (*Database, error) {
+func NewDatabase(ctx context.Context, conMan sqlutil.Connections, dbProperties *config.DatabaseOptions, cache caching.FederationCache, isLocalServerName func(spec.ServerName) bool) (*Database, error) {
 	var d Database
 	var err error
 	if d.db, d.writer, err = conMan.Connection(dbProperties); err != nil {