From 532573fb345dd173097848a0fc5fe958d1ceeeb0 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Tue, 20 Feb 2024 18:07:03 +0100 Subject: [PATCH] fix problems reported by golangci-lint --- .../memory_store/accessor/data_test.go | 6 ++-- backend/app/cmd/cleanup_test.go | 4 +-- backend/app/cmd/server.go | 2 +- backend/app/cmd/server_test.go | 2 +- backend/app/main_test.go | 2 +- backend/app/rest/api/rest_private.go | 2 +- backend/app/rest/api/rest_private_test.go | 2 +- backend/app/rest/api/rest_public_test.go | 2 +- backend/app/rest/api/rest_test.go | 18 +++++------ backend/app/rest/api/ssl_test.go | 4 +-- backend/app/rest/proxy/image.go | 2 +- backend/app/rest/proxy/image_test.go | 12 ++++---- backend/app/store/engine/bolt.go | 6 ++-- backend/app/store/formatter.go | 4 +-- backend/app/store/image/fs_store.go | 2 +- backend/app/store/image/image.go | 2 +- backend/app/store/image/image_test.go | 28 ++++++----------- backend/app/store/service/service.go | 2 +- backend/app/store/service/service_test.go | 30 +++++++++---------- backend/app/store/service/title_test.go | 2 +- 20 files changed, 62 insertions(+), 72 deletions(-) diff --git a/backend/_example/memory_store/accessor/data_test.go b/backend/_example/memory_store/accessor/data_test.go index db052979..919dc444 100644 --- a/backend/_example/memory_store/accessor/data_test.go +++ b/backend/_example/memory_store/accessor/data_test.go @@ -547,12 +547,12 @@ func TestMemData_FlagListBlocked(t *testing.T) { assert.NoError(t, err) blockedList := toBlocked(vv) - var blockedIds = make([]string, len(blockedList)) + var blockedIDs = make([]string, len(blockedList)) for i, x := range blockedList { - blockedIds[i] = x.ID + blockedIDs[i] = x.ID } require.Equal(t, 2, len(blockedList), b.metaUsers) - assert.ElementsMatch(t, []string{"user1", "user2"}, blockedIds) + assert.ElementsMatch(t, []string{"user1", "user2"}, blockedIDs) t.Logf("%+v", blockedList) // check block expiration diff --git a/backend/app/cmd/cleanup_test.go b/backend/app/cmd/cleanup_test.go index 40251310..05bbd678 100644 --- a/backend/app/cmd/cleanup_test.go +++ b/backend/app/cmd/cleanup_test.go @@ -195,7 +195,7 @@ func cleanupRoutes(t *testing.T, r *chi.Mux, c *cleanedComments) { require.NoError(t, json.NewEncoder(w).Encode(commentsWithInfo)) }) - r.HandleFunc("/api/v1/admin/comment/{id}", func(w http.ResponseWriter, r *http.Request) { + r.HandleFunc("/api/v1/admin/comment/{id}", func(_ http.ResponseWriter, r *http.Request) { require.Equal(t, "DELETE", r.Method) t.Log("delete ", r.URL.Path) c.lock.Lock() @@ -203,7 +203,7 @@ func cleanupRoutes(t *testing.T, r *chi.Mux, c *cleanedComments) { c.lock.Unlock() }) - r.HandleFunc("/api/v1/admin/title/{id}", func(w http.ResponseWriter, r *http.Request) { + r.HandleFunc("/api/v1/admin/title/{id}", func(_ http.ResponseWriter, r *http.Request) { require.Equal(t, "PUT", r.Method) t.Log("title for ", r.URL.Path) c.lock.Lock() diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go index 299d0fbc..84b27cb1 100644 --- a/backend/app/cmd/server.go +++ b/backend/app/cmd/server.go @@ -1224,7 +1224,7 @@ func (s *ServerCommand) getAuthenticator(ds *service.DataStore, avas avatar.Stor return c }), AdminPasswd: s.AdminPasswd, - Validator: token.ValidatorFunc(func(token string, claims token.Claims) bool { // check on each auth call (in middleware) + Validator: token.ValidatorFunc(func(_ string, claims token.Claims) bool { // check on each auth call (in middleware) if claims.User == nil { return false } diff --git a/backend/app/cmd/server_test.go b/backend/app/cmd/server_test.go index aa995a9c..c46ada75 100644 --- a/backend/app/cmd/server_test.go +++ b/backend/app/cmd/server_test.go @@ -250,7 +250,7 @@ func TestServerApp_WithSSL(t *testing.T) { client := http.Client{ // prevent http redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { + CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, diff --git a/backend/app/main_test.go b/backend/app/main_test.go index 4eeb78bb..7ec9f631 100644 --- a/backend/app/main_test.go +++ b/backend/app/main_test.go @@ -64,7 +64,7 @@ func TestMain_WithWebhook(t *testing.T) { defer os.RemoveAll(dir) var webhookSent int32 - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ts := httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) { atomic.StoreInt32(&webhookSent, 1) assert.Equal(t, "application/json", r.Header.Get("Content-Type")) diff --git a/backend/app/rest/api/rest_private.go b/backend/app/rest/api/rest_private.go index 4ef450f0..493d8064 100644 --- a/backend/app/rest/api/rest_private.go +++ b/backend/app/rest/api/rest_private.go @@ -246,7 +246,7 @@ func (s *private) userInfoCtrl(w http.ResponseWriter, r *http.Request) { if err != nil { log.Printf("[WARN] can't read email for %s, %v", user.ID, err) } - if len(email) > 0 { + if email != "" { user.EmailSubscription = true } } diff --git a/backend/app/rest/api/rest_private_test.go b/backend/app/rest/api/rest_private_test.go index 0be42560..b9ba503d 100644 --- a/backend/app/rest/api/rest_private_test.go +++ b/backend/app/rest/api/rest_private_test.go @@ -102,7 +102,7 @@ func TestRest_CreateAndPreviewWithImage(t *testing.T) { var pngRead bool // server with the test PNG image - pngServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + pngServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { _, e := io.Copy(w, gopherPNG()) assert.NoError(t, e) pngRead = true diff --git a/backend/app/rest/api/rest_public_test.go b/backend/app/rest/api/rest_public_test.go index 48c3bd94..8a0cf9a8 100644 --- a/backend/app/rest/api/rest_public_test.go +++ b/backend/app/rest/api/rest_public_test.go @@ -503,7 +503,7 @@ func TestRest_FindUserComments_CWE_918(t *testing.T) { defer teardown() backendRequestedArbitraryServer := false - arbitraryServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + arbitraryServer := httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) { t.Logf("request received: %+v", r) backendRequestedArbitraryServer = true })) diff --git a/backend/app/rest/api/rest_test.go b/backend/app/rest/api/rest_test.go index c2566dc9..c9900580 100644 --- a/backend/app/rest/api/rest_test.go +++ b/backend/app/rest/api/rest_test.go @@ -128,7 +128,7 @@ func TestRest_RunStaticSSLMode(t *testing.T) { client := http.Client{ // prevent http redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { + CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, @@ -178,7 +178,7 @@ func TestRest_RunAutocertModeHTTPOnly(t *testing.T) { client := http.Client{ // prevent http redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { + CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, } @@ -194,7 +194,7 @@ func TestRest_RunAutocertModeHTTPOnly(t *testing.T) { } func TestRest_rejectAnonUser(t *testing.T) { - ts := httptest.NewServer(fakeAuth(rejectAnonUser(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ts := httptest.NewServer(fakeAuth(rejectAnonUser(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { fmt.Fprintln(w, "Hello") })))) defer ts.Close() @@ -307,7 +307,7 @@ func TestRest_cacheControl(t *testing.T) { req := httptest.NewRequest("GET", tt.url, http.NoBody) w := httptest.NewRecorder() - h := cacheControl(tt.exp, tt.version)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) + h := cacheControl(tt.exp, tt.version)(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})) h.ServeHTTP(w, req) resp := w.Result() assert.Equal(t, http.StatusOK, resp.StatusCode) @@ -335,7 +335,7 @@ func TestRest_frameAncestors(t *testing.T) { req := httptest.NewRequest("GET", "http://example.com", http.NoBody) w := httptest.NewRecorder() - h := frameAncestors(tt.hosts)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) + h := frameAncestors(tt.hosts)(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})) h.ServeHTTP(w, req) resp := w.Result() assert.Equal(t, http.StatusOK, resp.StatusCode) @@ -371,7 +371,7 @@ func TestRest_subscribersOnly(t *testing.T) { req = token.SetUserInfo(req, tt.user) } w := httptest.NewRecorder() - h := subscribersOnly(tt.subsOnly)(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) + h := subscribersOnly(tt.subsOnly)(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})) h.ServeHTTP(w, req) resp := w.Result() assert.Equal(t, tt.status, resp.StatusCode) @@ -403,7 +403,7 @@ func Test_validEmailAuth(t *testing.T) { t.Run(strconv.Itoa(i), func(t *testing.T) { req := httptest.NewRequest("GET", "http://example.com"+tt.req, http.NoBody) w := httptest.NewRecorder() - h := validEmailAuth()(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {})) + h := validEmailAuth()(http.HandlerFunc(func(http.ResponseWriter, *http.Request) {})) h.ServeHTTP(w, req) resp := w.Result() assert.Equal(t, tt.status, resp.StatusCode) @@ -458,7 +458,7 @@ func startupT(t *testing.T, srvHook ...func(srv *Rest)) (ts *httptest.Server, sr DataService: dataStore, Authenticator: auth.NewService(auth.Opts{ AdminPasswd: "password", - SecretReader: token.SecretFunc(func(aud string) (string, error) { return "secret", nil }), + SecretReader: token.SecretFunc(func(string) (string, error) { return "secret", nil }), AvatarStore: avatar.NewLocalFS(tmp + "/ava-remark42"), }), Cache: memCache, @@ -495,7 +495,7 @@ func startupT(t *testing.T, srvHook ...func(srv *Rest)) (ts *httptest.Server, sr // add some providers. Needed because we don't allow users with unlisted providers to authenticate providers := []string{"provider1", "anonymous", "github", "email"} for _, p := range providers { - srv.Authenticator.AddDirectProvider(p, provider.CredCheckerFunc(func(user, password string) (ok bool, err error) { + srv.Authenticator.AddDirectProvider(p, provider.CredCheckerFunc(func(_, _ string) (ok bool, err error) { return true, nil })) } diff --git a/backend/app/rest/api/ssl_test.go b/backend/app/rest/api/ssl_test.go index fcf6b7c7..3a40bada 100644 --- a/backend/app/rest/api/ssl_test.go +++ b/backend/app/rest/api/ssl_test.go @@ -21,7 +21,7 @@ func TestSSL_Redirect(t *testing.T) { client := http.Client{ // prevent http redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { + CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, @@ -56,7 +56,7 @@ func TestSSL_ACME_HTTPChallengeRouter(t *testing.T) { client := http.Client{ // prevent http redirect - CheckRedirect: func(req *http.Request, via []*http.Request) error { + CheckRedirect: func(*http.Request, []*http.Request) error { return http.ErrUseLastResponse }, } diff --git a/backend/app/rest/proxy/image.go b/backend/app/rest/proxy/image.go index aa0319f7..70972dec 100644 --- a/backend/app/rest/proxy/image.go +++ b/backend/app/rest/proxy/image.go @@ -57,7 +57,7 @@ func (p Image) extract(commentHTML string, imgSrcPred func(string) bool) ([]stri return nil, fmt.Errorf("can't create document: %w", err) } result := []string{} - doc.Find("img").Each(func(i int, s *goquery.Selection) { + doc.Find("img").Each(func(_ int, s *goquery.Selection) { if im, ok := s.Attr("src"); ok { if imgSrcPred(im) { result = append(result, im) diff --git a/backend/app/rest/proxy/image_test.go b/backend/app/rest/proxy/image_test.go index fcbcb60b..10d8543b 100644 --- a/backend/app/rest/proxy/image_test.go +++ b/backend/app/rest/proxy/image_test.go @@ -95,7 +95,7 @@ func TestImage_Replace(t *testing.T) { func TestImage_Routes(t *testing.T) { // no image supposed to be cached - imageStore := image.StoreMock{LoadFunc: func(id string) ([]byte, error) { return nil, nil }} + imageStore := image.StoreMock{LoadFunc: func(string) ([]byte, error) { return nil, nil }} img := Image{ HTTP2HTTPS: true, RemarkURL: "https://demo.remark42.com", @@ -132,7 +132,7 @@ func TestImage_Routes(t *testing.T) { } func TestImage_DisabledCachingAndHTTP2HTTPS(t *testing.T) { - imageStore := image.StoreMock{LoadFunc: func(id string) ([]byte, error) { return nil, nil }} + imageStore := image.StoreMock{LoadFunc: func(string) ([]byte, error) { return nil, nil }} img := Image{ RemarkURL: "https://demo.remark42.com", RoutePath: "/api/v1/proxy", @@ -158,10 +158,10 @@ func TestImage_DisabledCachingAndHTTP2HTTPS(t *testing.T) { func TestImage_RoutesCachingImage(t *testing.T) { imageStore := image.StoreMock{ - LoadFunc: func(id string) ([]byte, error) { + LoadFunc: func(string) ([]byte, error) { return nil, nil }, - SaveFunc: func(id string, img []byte) error { + SaveFunc: func(string, []byte) error { return nil }, } @@ -196,7 +196,7 @@ func TestImage_RoutesCachingImage(t *testing.T) { func TestImage_RoutesUsingCachedImage(t *testing.T) { // In order to validate that cached data used cache "will return" some other data from what http server would testImage := []byte(fmt.Sprintf("%256s", "X")) - imageStore := image.StoreMock{LoadFunc: func(id string) ([]byte, error) { + imageStore := image.StoreMock{LoadFunc: func(string) ([]byte, error) { return testImage, nil }} img := Image{ @@ -226,7 +226,7 @@ func TestImage_RoutesUsingCachedImage(t *testing.T) { func TestImage_RoutesTimedOut(t *testing.T) { // no image supposed to be cached - imageStore := image.StoreMock{LoadFunc: func(id string) ([]byte, error) { return nil, nil }} + imageStore := image.StoreMock{LoadFunc: func(string) ([]byte, error) { return nil, nil }} img := Image{ HTTP2HTTPS: true, RemarkURL: "https://demo.remark42.com", diff --git a/backend/app/store/engine/bolt.go b/backend/app/store/engine/bolt.go index 3542eba5..3117c144 100644 --- a/backend/app/store/engine/bolt.go +++ b/backend/app/store/engine/bolt.go @@ -170,7 +170,7 @@ func (b *BoltDB) Find(req FindRequest) (comments []store.Comment, err error) { return e } - return bucket.ForEach(func(k, v []byte) error { + return bucket.ForEach(func(_, v []byte) error { comment := store.Comment{} if e = json.Unmarshal(v, &comment); e != nil { return fmt.Errorf("failed to unmarshal: %w", e) @@ -724,7 +724,7 @@ func (b *BoltDB) listDetails(loc store.Locator) (result []UserDetailEntry, err e err = bdb.View(func(tx *bolt.Tx) error { var entry UserDetailEntry bucket := tx.Bucket([]byte(userDetailsBucketName)) - return bucket.ForEach(func(userID, value []byte) error { + return bucket.ForEach(func(_, value []byte) error { if err = json.Unmarshal(value, &entry); err != nil { return fmt.Errorf("failed to unmarshal entry: %w", e) } @@ -869,7 +869,7 @@ func (b *BoltDB) deleteUser(bdb *bolt.DB, siteID, userID string, mode store.Dele err = bdb.View(func(tx *bolt.Tx) error { postsBkt := tx.Bucket([]byte(postsBucketName)) postBkt := postsBkt.Bucket([]byte(postInfo.URL)) - err = postBkt.ForEach(func(postURL []byte, commentVal []byte) error { + err = postBkt.ForEach(func(_ []byte, commentVal []byte) error { comment := store.Comment{} if err = json.Unmarshal(commentVal, &comment); err != nil { return fmt.Errorf("failed to unmarshal: %w", err) diff --git a/backend/app/store/formatter.go b/backend/app/store/formatter.go index 6855ae40..0959a85e 100644 --- a/backend/app/store/formatter.go +++ b/backend/app/store/formatter.go @@ -62,7 +62,7 @@ func (f *CommentFormatter) shortenAutoLinks(commentHTML string, max int) (resHTM if err != nil { return commentHTML } - doc.Find("a").Each(func(i int, s *goquery.Selection) { + doc.Find("a").Each(func(_ int, s *goquery.Selection) { if href, ok := s.Attr("href"); ok { if href != s.Text() || len(href) < max+3 || max < 3 { return @@ -110,7 +110,7 @@ func (f *CommentFormatter) lazyImage(commentHTML string) (resHTML string) { if err != nil { return commentHTML } - doc.Find("img").Each(func(i int, s *goquery.Selection) { + doc.Find("img").Each(func(_ int, s *goquery.Selection) { s.SetAttr("loading", "lazy") }) resHTML, err = doc.Find("body").Html() diff --git a/backend/app/store/image/fs_store.go b/backend/app/store/image/fs_store.go index cf9a3907..80120171 100644 --- a/backend/app/store/image/fs_store.go +++ b/backend/app/store/image/fs_store.go @@ -166,7 +166,7 @@ func (f *FileSystem) Info() (StoreInfo, error) { } var ts time.Time - err := filepath.Walk(f.Staging, func(fpath string, info os.FileInfo, err error) error { + err := filepath.Walk(f.Staging, func(_ string, info os.FileInfo, err error) error { if err != nil { return err } diff --git a/backend/app/store/image/image.go b/backend/app/store/image/image.go index 647594c5..6339d8e1 100644 --- a/backend/app/store/image/image.go +++ b/backend/app/store/image/image.go @@ -250,7 +250,7 @@ func (s *Service) extractImageIDs(commentHTML string, includeProxied bool) (ids log.Printf("[ERROR] can't parse commentHTML to parse images: %q, error: %v", commentHTML, err) return nil } - doc.Find("img").Each(func(i int, sl *goquery.Selection) { + doc.Find("img").Each(func(_ int, sl *goquery.Selection) { if im, ok := sl.Attr("src"); ok { if strings.Contains(im, s.ImageAPI) { elems := strings.Split(im, "/") diff --git a/backend/app/store/image/image_test.go b/backend/app/store/image/image_test.go index 7ca85b14..baf9f9e5 100644 --- a/backend/app/store/image/image_test.go +++ b/backend/app/store/image/image_test.go @@ -19,10 +19,10 @@ import ( func TestService_SaveAndLoad(t *testing.T) { store := StoreMock{ - SaveFunc: func(id string, img []byte) error { + SaveFunc: func(string, []byte) error { return nil }, - LoadFunc: func(id string) ([]byte, error) { + LoadFunc: func(string) ([]byte, error) { return nil, nil }, } @@ -126,7 +126,7 @@ func TestService_ExtractPictures(t *testing.T) { func TestService_Cleanup(t *testing.T) { store := StoreMock{ - CleanupFunc: func(ctx context.Context, ttl time.Duration) error { + CleanupFunc: func(context.Context, time.Duration) error { return nil }, } @@ -141,12 +141,8 @@ func TestService_Cleanup(t *testing.T) { func TestService_Submit(t *testing.T) { store := StoreMock{ - CommitFunc: func(id string) error { - return nil - }, - ResetCleanupTimerFunc: func(id string) error { - return nil - }, + CommitFunc: func(string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } svc := NewService(&store, ServiceParams{ImageAPI: "/blah/", EditDuration: time.Millisecond * 100}) svc.Submit(func() []string { return []string{"id1", "id2", "id3"} }) @@ -164,12 +160,8 @@ func TestService_Submit(t *testing.T) { func TestService_Close(t *testing.T) { store := StoreMock{ - CommitFunc: func(id string) error { - return nil - }, - ResetCleanupTimerFunc: func(id string) error { - return nil - }, + CommitFunc: func(string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } svc := Service{store: &store, ServiceParams: ServiceParams{ImageAPI: "/blah/", EditDuration: time.Hour * 24}} svc.Submit(func() []string { return []string{"id1", "id2", "id3"} }) @@ -182,10 +174,8 @@ func TestService_Close(t *testing.T) { func TestService_SubmitDelay(t *testing.T) { store := StoreMock{ - CommitFunc: func(id string) error { - return nil - }, - ResetCleanupTimerFunc: func(id string) error { + CommitFunc: func(string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } diff --git a/backend/app/store/service/service.go b/backend/app/store/service/service.go index 48e722c9..d4dfb8ab 100644 --- a/backend/app/store/service/service.go +++ b/backend/app/store/service/service.go @@ -657,7 +657,7 @@ func (s *DataStore) ValidateComment(c *store.Comment) error { mdExt, rend := store.GetMdExtensionsAndRenderer(false) parser := bf.New(bf.WithRenderer(rend), bf.WithExtensions(bf.CommonExtensions), bf.WithExtensions(mdExt)) var wrongLinkError error - parser.Parse([]byte(c.Orig)).Walk(func(node *bf.Node, entering bool) bf.WalkStatus { + parser.Parse([]byte(c.Orig)).Walk(func(node *bf.Node, _ bool) bf.WalkStatus { if len(node.LinkData.Destination) != 0 && !(strings.HasPrefix(string(node.LinkData.Destination), "http://") || strings.HasPrefix(string(node.LinkData.Destination), "https://") || diff --git a/backend/app/store/service/service_test.go b/backend/app/store/service/service_test.go index 258953b8..56ae8c10 100644 --- a/backend/app/store/service/service_test.go +++ b/backend/app/store/service/service_test.go @@ -615,20 +615,20 @@ func TestDataStore_AdminStoreErrors(t *testing.T) { badKey := true badEnabled := true as := admin.StoreMock{ - OnEventFunc: func(siteID string, et admin.EventType) error { return errors.New("err") }, - KeyFunc: func(siteID string) (string, error) { + OnEventFunc: func(string, admin.EventType) error { return errors.New("err") }, + KeyFunc: func(string) (string, error) { if badKey { return "", errors.New("mock key err") } return "secret", nil }, - EnabledFunc: func(siteID string) (bool, error) { + EnabledFunc: func(string) (bool, error) { if badEnabled { return false, errors.New("mock enabled err") } return true, nil }, - AdminsFunc: func(siteID string) ([]string, error) { return nil, errors.New("mock admins err") }, + AdminsFunc: func(string) ([]string, error) { return nil, errors.New("mock admins err") }, } eng, teardown := prepStoreEngine(t) defer teardown() @@ -1410,9 +1410,9 @@ func TestService_deleteImagesOnCommentDelete(t *testing.T) { lgr.Setup(lgr.Debug, lgr.CallerFile, lgr.CallerFunc) mockStore := image.StoreMock{ - DeleteFunc: func(id string) error { return nil }, - CommitFunc: func(id string) error { return nil }, - ResetCleanupTimerFunc: func(id string) error { return nil }, + DeleteFunc: func(string) error { return nil }, + CommitFunc: func(string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } imgSvc := image.NewService(&mockStore, image.ServiceParams{ @@ -1660,8 +1660,8 @@ func TestService_submitImages(t *testing.T) { lgr.Setup(lgr.Debug, lgr.CallerFile, lgr.CallerFunc) mockStore := image.StoreMock{ - CommitFunc: func(id string) error { return nil }, - ResetCleanupTimerFunc: func(id string) error { return nil }, + CommitFunc: func(string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } imgSvc := image.NewService(&mockStore, image.ServiceParams{ @@ -1702,10 +1702,10 @@ func TestService_ResubmitStagingImages(t *testing.T) { InfoFunc: func() (image.StoreInfo, error) { return image.StoreInfo{FirstStagingImageTS: time.Time{}.Add(time.Second)}, nil }, - CommitFunc: func(id string) error { + CommitFunc: func(string) error { return nil }, - ResetCleanupTimerFunc: func(id string) error { return nil }, + ResetCleanupTimerFunc: func(string) error { return nil }, } imgSvc := image.NewService(&mockStore, image.ServiceParams{ @@ -1797,7 +1797,7 @@ func TestService_ResubmitStagingImages_EngineError(t *testing.T) { first := true engineMock := engine.InterfaceMock{ - FindFunc: func(req engine.FindRequest) ([]store.Comment, error) { + FindFunc: func(engine.FindRequest) ([]store.Comment, error) { if first { first = false return nil, nil @@ -1822,7 +1822,7 @@ func TestService_ResubmitStagingImages_EngineError(t *testing.T) { func TestService_alterComment(t *testing.T) { engineMock := engine.InterfaceMock{ - FlagFunc: func(req engine.FlagRequest) (bool, error) { + FlagFunc: func(engine.FlagRequest) (bool, error) { return false, nil }, } @@ -1844,7 +1844,7 @@ func TestService_alterComment(t *testing.T) { first := true engineMock = engine.InterfaceMock{ - FlagFunc: func(req engine.FlagRequest) (bool, error) { + FlagFunc: func(engine.FlagRequest) (bool, error) { if first { first = false return false, nil @@ -1862,7 +1862,7 @@ func TestService_alterComment(t *testing.T) { first = true engineMock = engine.InterfaceMock{ - FlagFunc: func(req engine.FlagRequest) (bool, error) { + FlagFunc: func(engine.FlagRequest) (bool, error) { if first { first = false return true, nil diff --git a/backend/app/store/service/title_test.go b/backend/app/store/service/title_test.go index b57d1235..5a949edd 100644 --- a/backend/app/store/service/title_test.go +++ b/backend/app/store/service/title_test.go @@ -107,7 +107,7 @@ func TestTitle_GetFailed(t *testing.T) { ex := NewTitleExtractor(http.Client{Timeout: 5 * time.Second}, []string{"127.0.0.1"}) defer ex.Close() var hits int32 - ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) { atomic.AddInt32(&hits, 1) w.WriteHeader(404) }))