rename more

3 files changed, 42 insertions, 41 deletions

diff --git a/internal/server/repository/repository_test.go b/internal/server/repository/repository_test.go
index 348abb8..20fa6ec 100644
--- a/internal/server/repository/repository_test.go
+++ b/internal/server/repository/repository_test.go
@@ -177,21 +177,21 @@ func TestRepositoryMergeFromPartner(t *testing.T) {
 
 	getEntry := func(ctx context.Context, partner, id string, entry *types.Entry) error {
 		var (
-			ent_ types.Entry
-			err  error
+			entry_ types.Entry
+			err    error
 		)
 
 		switch partner {
 		case "repo1":
-			ent_, err = repo1.Get(id)
+			entry_, err = repo1.Get(id)
 		case "repo2":
-			ent_, err = repo2.Get(id)
+			entry_, err = repo2.Get(id)
 		}
 
 		if err != nil {
 			return err
 		}
-		*entry = ent_
+		*entry = entry_
 
 		t.Log("got entry", *entry, "from repo", partner)
 		return nil
diff --git a/internal/types/entry.go b/internal/types/entry.go
index 2f044f3..9f3531a 100644
--- a/internal/types/entry.go
+++ b/internal/types/entry.go
@@ -12,13 +12,14 @@ import (
 
 type PlatformName = string
 type EntryID = string
+type Epoch = int
 
 type Entry struct {
 	// The unique ID of this entry.
 	ID     EntryID                 `json:"id,omitempty"`
 	Body   string                  `json:"body"`
 	Shared map[PlatformName]Shared `json:"shared,omitempty"`
-	Epoch  int                     `json:"epoch,omitempty"`
+	Epoch  Epoch                   `json:"epoch,omitempty"`
 
 	// The checksum of the whole entry, can change depending on the state.
 	checksum      string
diff --git a/internal/types/entry_test.go b/internal/types/entry_test.go
index a329ec7..3dde570 100644
--- a/internal/types/entry_test.go
+++ b/internal/types/entry_test.go
@@ -4,41 +4,6 @@ import (
 	"testing"
 )
 
-func oneEntry() (Entry, error) {
-	entry := `
-		{
-			"body": "Body text here",
-			"shared": {
-				"Foo": { "is": true },
-				"Bar": { "is": false }
-			}
-		}
-	`
-	return NewEntry([]byte(entry))
-}
-
-func anotherEntry() (Entry, error) {
-	entry := `
-		{
-			"body": "Body text here",
-			"shared": {
-				"Foo": { "is": true },
-				"Bar": { "is": true },
-				"Baz": { "is": false }
-			}
-		}
-	`
-	return NewEntry([]byte(entry))
-}
-
-func twoDifferentEntries() (entry1, entry2 Entry, err error) {
-	if entry1, err = oneEntry(); err != nil {
-		return
-	}
-	entry2, err = anotherEntry()
-	return
-}
-
 func TestNewEntryFromJSON(t *testing.T) {
 	entry1, err := oneEntry()
 	if err != nil {
@@ -143,3 +108,38 @@ func TestUpdate(t *testing.T) {
 		t.Error("expected 2 shared entries after update but got", sharedCount, entry1)
 	}
 }
+
+func oneEntry() (Entry, error) {
+	entry := `
+		{
+			"body": "Body text here",
+			"shared": {
+				"Foo": { "is": true },
+				"Bar": { "is": false }
+			}
+		}
+	`
+	return NewEntry([]byte(entry))
+}
+
+func anotherEntry() (Entry, error) {
+	entry := `
+		{
+			"body": "Body text here",
+			"shared": {
+				"Foo": { "is": true },
+				"Bar": { "is": true },
+				"Baz": { "is": false }
+			}
+		}
+	`
+	return NewEntry([]byte(entry))
+}
+
+func twoDifferentEntries() (entry1, entry2 Entry, err error) {
+	if entry1, err = oneEntry(); err != nil {
+		return
+	}
+	entry2, err = anotherEntry()
+	return
+}