From e22ed266335de43f3989c5ce0f70422ba784115f Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Mon, 13 Nov 2023 11:22:49 -0800
Subject: [PATCH] storage: resolve linter errors (#432)

Signed-off-by: James Hillyerd <james@hillyerd.com>
---
 pkg/storage/mem/store_test.go |  9 +++++++--
 pkg/storage/retention_test.go | 12 ++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkg/storage/mem/store_test.go b/pkg/storage/mem/store_test.go
index ece95b9..79c2ad9 100644
--- a/pkg/storage/mem/store_test.go
+++ b/pkg/storage/mem/store_test.go
@@ -9,6 +9,7 @@ import (
 	"github.com/inbucket/inbucket/v3/pkg/extension"
 	"github.com/inbucket/inbucket/v3/pkg/storage"
 	"github.com/inbucket/inbucket/v3/pkg/test"
+	"github.com/stretchr/testify/require"
 )
 
 // TestSuite runs storage package test suite on file store.
@@ -52,12 +53,13 @@ func TestMaxSize(t *testing.T) {
 
 	// Calculate actual size.
 	gotSize := int64(0)
-	s.VisitMailboxes(func(messages []storage.Message) bool {
+	err := s.VisitMailboxes(func(messages []storage.Message) bool {
 		for _, m := range messages {
 			gotSize += m.Size()
 		}
 		return true
 	})
+	require.NoError(t, err, "VisitMailboxes() must succeed")
 
 	// Verify state. Messages are ~75 bytes each.
 	if gotSize < 2048-75 {
@@ -80,11 +82,14 @@ func TestMaxSize(t *testing.T) {
 		}(mailbox)
 	}
 	wg.Wait()
+
+	// Verify zero stored messages.
 	count := 0
-	s.VisitMailboxes(func(messages []storage.Message) bool {
+	err = s.VisitMailboxes(func(messages []storage.Message) bool {
 		count += len(messages)
 		return true
 	})
+	require.NoError(t, err, "VisitMailboxes() must succeed")
 	if count != 0 {
 		t.Errorf("Got %v total messages, want: %v", count, 0)
 	}
diff --git a/pkg/storage/retention_test.go b/pkg/storage/retention_test.go
index 0a4f45f..b6fa113 100644
--- a/pkg/storage/retention_test.go
+++ b/pkg/storage/retention_test.go
@@ -23,12 +23,12 @@ func TestDoRetentionScan(t *testing.T) {
 	old1 := stubMessage("mb1", 4)
 	old2 := stubMessage("mb1", 12)
 	old3 := stubMessage("mb2", 24)
-	ds.AddMessage(new1)
-	ds.AddMessage(old1)
-	ds.AddMessage(old2)
-	ds.AddMessage(old3)
-	ds.AddMessage(new2)
-	ds.AddMessage(new3)
+	_, _ = ds.AddMessage(new1)
+	_, _ = ds.AddMessage(old1)
+	_, _ = ds.AddMessage(old2)
+	_, _ = ds.AddMessage(old3)
+	_, _ = ds.AddMessage(new2)
+	_, _ = ds.AddMessage(new3)
 
 	// Test 4 hour retention
 	cfg := config.Storage{