diff options
| author | Paul Buetow <paul@buetow.org> | 2024-08-12 09:59:46 +0300 |
|---|---|---|
| committer | Paul Buetow <paul@buetow.org> | 2024-08-12 09:59:46 +0300 |
| commit | d4cd58ced21fdaacd09f1fb1aeace0bf5f7dd251 (patch) | |
| tree | 591c99e884c3fdadcbe71d3f8501fba2557b8591 | |
| parent | c3b3e09fe8da976d055b291887cf4ceba6e2048e (diff) | |
fix
| -rw-r--r-- | internal/server/repository/repository.go | 5 | ||||
| -rw-r--r-- | 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") } } |
