From d4cd58ced21fdaacd09f1fb1aeace0bf5f7dd251 Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Mon, 12 Aug 2024 09:59:46 +0300 Subject: fix --- internal/server/repository/repository.go | 5 ++--- internal/server/repository/repository_test.go | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go index ca1919c..2f5b525 100644 --- a/internal/server/repository/repository.go +++ b/internal/server/repository/repository.go @@ -140,8 +140,7 @@ func (r Repository) Get(id string) (types.Entry, bool) { return ent, ok } -// TODO: Make all methods not used externally in this file private -func (r Repository) HasSameEntry(pair EntryPair) bool { +func (r Repository) hasSameEntry(pair EntryPair) bool { _ = r.load() r.mu.Lock() defer r.mu.Unlock() @@ -209,7 +208,7 @@ func (r Repository) mergeRemotelyFromPartner(ctx context.Context, partner string } for _, pair := range pairs { - if r.HasSameEntry(pair) { + if r.hasSameEntry(pair) { continue } diff --git a/internal/server/repository/repository_test.go b/internal/server/repository/repository_test.go index 78a7a59..fbf514c 100644 --- a/internal/server/repository/repository_test.go +++ b/internal/server/repository/repository_test.go @@ -99,12 +99,12 @@ func TestRepositoryHasSameEntry(t *testing.T) { _ = repo.put(ent) pair := EntryPair{ent.ID, ent.Checksum()} - if !repo.HasSameEntry(pair) { + if !repo.hasSameEntry(pair) { t.Error("repo does not contain entry corresponding to pair", pair) } pair = EntryPair{"nonexistent", "nonexistent"} - if repo.HasSameEntry(pair) { + if repo.hasSameEntry(pair) { t.Error("repo does contain entry corresponding to pair", pair, "but that should not be") } } -- cgit v1.2.3