summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Buetow <paul@buetow.org>2024-08-12 10:01:02 +0300
committerPaul Buetow <paul@buetow.org>2024-08-12 10:01:02 +0300
commit85a4cdea7c41cfd2f4fcbe1554494fb0b78ae338 (patch)
treed3df15302068d14e99932486725a5d6b80796209
parentd4cd58ced21fdaacd09f1fb1aeace0bf5f7dd251 (diff)
entry pair is local
-rw-r--r--internal/server/repository/repository.go14
-rw-r--r--internal/server/repository/repository_test.go4
2 files changed, 9 insertions, 9 deletions
diff --git a/internal/server/repository/repository.go b/internal/server/repository/repository.go
index 2f5b525..c81d4f9 100644
--- a/internal/server/repository/repository.go
+++ b/internal/server/repository/repository.go
@@ -27,7 +27,7 @@ type fs interface {
}
// Contains an Entry ID and its checksumm, for the list and merge operations.
-type EntryPair struct {
+type entryPair struct {
ID, Checksum string
}
@@ -107,17 +107,17 @@ func (r Repository) load() error {
return errors.Join(errs...)
}
-func (r Repository) List() ([]EntryPair, error) {
+func (r Repository) List() ([]entryPair, error) {
if err := r.load(); err != nil {
- return []EntryPair{}, err
+ return []entryPair{}, err
}
- var pairs []EntryPair
+ var pairs []entryPair
r.mu.Lock()
defer r.mu.Unlock()
for _, ent := range r.entries {
- pairs = append(pairs, EntryPair{ent.ID, ent.Checksum()})
+ pairs = append(pairs, entryPair{ent.ID, ent.Checksum()})
}
return pairs, nil
@@ -140,7 +140,7 @@ func (r Repository) Get(id string) (types.Entry, bool) {
return ent, ok
}
-func (r Repository) hasSameEntry(pair EntryPair) bool {
+func (r Repository) hasSameEntry(pair entryPair) bool {
_ = r.load()
r.mu.Lock()
defer r.mu.Unlock()
@@ -200,7 +200,7 @@ func (r Repository) mergeRemotelyFromPartner(ctx context.Context, partner string
var (
errs []error
uri = fmt.Sprintf("%s/list", partner)
- pairs []EntryPair
+ pairs []entryPair
)
if err := easyhttp.GetData(ctx, uri, r.conf.APIKey, &pairs); err != nil {
diff --git a/internal/server/repository/repository_test.go b/internal/server/repository/repository_test.go
index fbf514c..1a5262f 100644
--- a/internal/server/repository/repository_test.go
+++ b/internal/server/repository/repository_test.go
@@ -98,12 +98,12 @@ func TestRepositoryHasSameEntry(t *testing.T) {
ent, _ := makeAnEntry()
_ = repo.put(ent)
- pair := EntryPair{ent.ID, ent.Checksum()}
+ pair := entryPair{ent.ID, ent.Checksum()}
if !repo.hasSameEntry(pair) {
t.Error("repo does not contain entry corresponding to pair", pair)
}
- pair = EntryPair{"nonexistent", "nonexistent"}
+ pair = entryPair{"nonexistent", "nonexistent"}
if repo.hasSameEntry(pair) {
t.Error("repo does contain entry corresponding to pair", pair, "but that should not be")
}