From 0518309586b976db55bdf10b437ae1b8d46a4eee Mon Sep 17 00:00:00 2001
From: Kegan Dougal <kegan@matrix.org>
Date: Thu, 23 Jul 2020 16:04:18 +0100
Subject: [PATCH] Linting

---
 keyserver/internal/internal.go | 9 ++++++---
 syncapi/consumers/keychange.go | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/keyserver/internal/internal.go b/keyserver/internal/internal.go
index 24429474b..d3a6d4bae 100644
--- a/keyserver/internal/internal.go
+++ b/keyserver/internal/internal.go
@@ -292,7 +292,10 @@ func (a *KeyInternalAPI) uploadDeviceKeys(ctx context.Context, req *api.PerformU
 		}
 		return
 	}
-	a.emitDeviceKeyChanges(existingKeys, keysToStore)
+	err := a.emitDeviceKeyChanges(existingKeys, keysToStore)
+	if err != nil {
+		util.GetLogger(ctx).Errorf("Failed to emitDeviceKeyChanges: %s", err)
+	}
 }
 
 func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.PerformUploadKeysRequest, res *api.PerformUploadKeysResponse) {
@@ -334,7 +337,7 @@ func (a *KeyInternalAPI) uploadOneTimeKeys(ctx context.Context, req *api.Perform
 
 }
 
-func (a *KeyInternalAPI) emitDeviceKeyChanges(existing, new []api.DeviceKeys) {
+func (a *KeyInternalAPI) emitDeviceKeyChanges(existing, new []api.DeviceKeys) error {
 	// find keys in new that are not in existing
 	var keysAdded []api.DeviceKeys
 	for _, newKey := range new {
@@ -349,5 +352,5 @@ func (a *KeyInternalAPI) emitDeviceKeyChanges(existing, new []api.DeviceKeys) {
 			keysAdded = append(keysAdded, newKey)
 		}
 	}
-	a.Producer.ProduceKeyChanges(keysAdded)
+	return a.Producer.ProduceKeyChanges(keysAdded)
 }
diff --git a/syncapi/consumers/keychange.go b/syncapi/consumers/keychange.go
index 4f57c8099..23961452d 100644
--- a/syncapi/consumers/keychange.go
+++ b/syncapi/consumers/keychange.go
@@ -34,7 +34,7 @@ type OutputKeyChangeEventConsumer struct {
 	db                storage.Database
 	serverName        gomatrixserverlib.ServerName // our server name
 	currentStateAPI   currentstateAPI.CurrentStateInternalAPI
-	keyAPI            api.KeyInternalAPI
+	// keyAPI            api.KeyInternalAPI
 }
 
 // NewOutputKeyChangeEventConsumer creates a new OutputKeyChangeEventConsumer.