From 7d8d752ee1a565da83f54c5723ad04a1ce1eb379 Mon Sep 17 00:00:00 2001 From: Brian Meek Date: Wed, 27 Jul 2022 10:33:19 -0700 Subject: [PATCH] Remove autoformatting related changes and a closure that is not needed --- docs/CONTRIBUTING.md | 10 +++++----- keyserver/storage/storage_test.go | 5 ++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index c359615df..771af9ecf 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -35,16 +35,16 @@ submitting your contribution. ## Comments -Please make sure that the comments adequately explain _why_ your code does what it +Please make sure that the comments adequately explain *why* your code does what it does. If there are statements that are not obvious, please comment what they do. We also have some special tags which we use for searchability. These are: -- `// TODO:` for places where a future review, rewrite or refactor is likely required; -- `// FIXME:` for places where we know there is an outstanding bug that needs a fix; -- `// NOTSPEC:` for places where the behaviour specifically does not match what the +* `// TODO:` for places where a future review, rewrite or refactor is likely required; +* `// FIXME:` for places where we know there is an outstanding bug that needs a fix; +* `// NOTSPEC:` for places where the behaviour specifically does not match what the [Matrix Specification](https://spec.matrix.org/) prescribes, along with a description - of _why_ that is the case. + of *why* that is the case. ## Linting diff --git a/keyserver/storage/storage_test.go b/keyserver/storage/storage_test.go index 231a4647c..e7a2af7c2 100644 --- a/keyserver/storage/storage_test.go +++ b/keyserver/storage/storage_test.go @@ -176,9 +176,8 @@ func TestDeviceKeysStreamIDGeneration(t *testing.T) { dbLock.Lock() defer dbLock.Unlock() // Querying for device keys returns the latest stream IDs - msgs, err = func() ([]api.DeviceMessage, error) { - return db.DeviceKeysForUser(ctx, alice, deviceArray, false) - }() + msgs, err = db.DeviceKeysForUser(ctx, alice, deviceArray, false) + if err != nil { t.Fatalf("DeviceKeysForUser returned error: %s", err) }