mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-21 05:43:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix lint

Browse source
This commit is contained in:
Neil Alexander 2020-06-16 13:07:44 +01:00
parent 740db77e5b
commit 7d20e1836f
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
serverkeyapi/internal/api.go
View file

@ -61,9 +61,7 @@ func (s *ServerKeyAPI) FetchKeys(
// First, check if any of these key checks are for our own keys. If // First, check if any of these key checks are for our own keys. If
// they are then we will satisfy them directly. // they are then we will satisfy them directly.
if err := s.handleLocalKeys(ctx, requests, results); err != nil { s.handleLocalKeys(ctx, requests, results)
return nil, err
}
// Then consult our local database and see if we have the requested // Then consult our local database and see if we have the requested
// keys. These might come from a cache, depending on the database // keys. These might come from a cache, depending on the database
@ -116,10 +114,10 @@ func (s *ServerKeyAPI) FetcherName() string {
// handleLocalKeys handles cases where the key request contains // handleLocalKeys handles cases where the key request contains
// a request for our own server keys. // a request for our own server keys.
func (s *ServerKeyAPI) handleLocalKeys( func (s *ServerKeyAPI) handleLocalKeys(
ctx context.Context, _ context.Context,
requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp, requests map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.Timestamp,
results map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult, results map[gomatrixserverlib.PublicKeyLookupRequest]gomatrixserverlib.PublicKeyLookupResult,
) error { ) {
for req := range requests { for req := range requests {
if req.ServerName == s.ServerName { if req.ServerName == s.ServerName {
// We found a key request that is supposed to be for our own // We found a key request that is supposed to be for our own
@ -137,8 +135,6 @@ func (s *ServerKeyAPI) handleLocalKeys(
} }
} }
} }
return nil
} }
// handleDatabaseKeys handles cases where the key requests can be // handleDatabaseKeys handles cases where the key requests can be