From 79ebb0d6a8161f72eaa395389e5a05ac91ca6a01 Mon Sep 17 00:00:00 2001
From: Neil Alexander <neilalexander@users.noreply.github.com>
Date: Tue, 25 Oct 2022 12:24:07 +0100
Subject: [PATCH] See if we can make the linter happier

---
 .github/workflows/dendrite.yml | 2 +-
 userapi/internal/api.go        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index 4eed20d9f..ed9d431e2 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -122,7 +122,7 @@ jobs:
           key: ${{ runner.os }}-go${{ matrix.go }}-test-${{ hashFiles('**/go.sum') }}
           restore-keys: |
             ${{ runner.os }}-go${{ matrix.go }}-test-
-      - run: go test ./... | gotestfmt
+      - run: go test -json -v ./... | gotestfmt
         env:
           POSTGRES_HOST: localhost
           POSTGRES_USER: postgres
diff --git a/userapi/internal/api.go b/userapi/internal/api.go
index af3633a56..4f5537383 100644
--- a/userapi/internal/api.go
+++ b/userapi/internal/api.go
@@ -202,6 +202,7 @@ func (a *UserInternalAPI) PerformDeviceCreation(ctx context.Context, req *api.Pe
 	if serverName == "" {
 		serverName = a.Config.Matrix.ServerName
 	}
+	_ = serverName
 	// XXXX: Use the server name here
 	util.GetLogger(ctx).WithFields(logrus.Fields{
 		"localpart":    req.Localpart,