From 5cd2632f39691bb3772cc70f7e07d6d913cfb975 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Mon, 24 Oct 2022 09:49:48 +0100 Subject: [PATCH] Tidy up --- keyserver/internal/internal.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go index 26adaffbd..ff0968b27 100644 --- a/keyserver/internal/internal.go +++ b/keyserver/internal/internal.go @@ -257,8 +257,6 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques res.UserSigningKeys = make(map[string]gomatrixserverlib.CrossSigningKey) res.Failures = make(map[string]interface{}) - logrus.Print("QueryKeys:", req.UserID, req.Timeout, req.UserToDevices) - // make a map from domain to device keys domainToDeviceKeys := make(map[string]map[string][]string) domainToCrossSigningKeys := make(map[string]map[string]struct{}) @@ -335,7 +333,8 @@ func (a *KeyInternalAPI) QueryKeys(ctx context.Context, req *api.QueryKeysReques a.queryRemoteKeys(ctx, req.Timeout, res, domainToDeviceKeys, domainToCrossSigningKeys) } - // get cross-signing keys from the database + // Now that we've done the potentially expensive work of asking the federation, + // try filling the cross-signing keys from the database that we know about. a.crossSigningKeysFromDatabase(ctx, req, res) // Finally, append signatures that we know about