object/stored: Move from objectstored

2 files changed, 24 insertions, 24 deletions

diff --git a/repository/stored.go b/repository/stored.go
index d7ee5267..ca782cea 100644
--- a/repository/stored.go
+++ b/repository/stored.go
@@ -4,15 +4,15 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/object"
+	"codeberg.org/lindenii/furgit/object/stored"
 	"codeberg.org/lindenii/furgit/objectid"
-	"codeberg.org/lindenii/furgit/objectstored"
 	"codeberg.org/lindenii/furgit/objecttype"
 )
 
 // ReadStored reads, parses, and wraps one object by ID.
 //
 //nolint:ireturn
-func (repo *Repository) ReadStored(id objectid.ObjectID) (objectstored.StoredObject, error) {
+func (repo *Repository) ReadStored(id objectid.ObjectID) (stored.StoredObject, error) {
 	parsed, err := repo.readParsedObject(id)
 	if err != nil {
 		return nil, err
@@ -20,73 +20,73 @@ func (repo *Repository) ReadStored(id objectid.ObjectID) (objectstored.StoredObj
 
 	switch parsed := parsed.(type) {
 	case *object.Blob:
-		return objectstored.NewStoredBlob(id, parsed), nil
+		return stored.NewStoredBlob(id, parsed), nil
 	case *object.Tree:
-		return objectstored.NewStoredTree(id, parsed), nil
+		return stored.NewStoredTree(id, parsed), nil
 	case *object.Commit:
-		return objectstored.NewStoredCommit(id, parsed), nil
+		return stored.NewStoredCommit(id, parsed), nil
 	case *object.Tag:
-		return objectstored.NewStoredTag(id, parsed), nil
+		return stored.NewStoredTag(id, parsed), nil
 	default:
 		return nil, fmt.Errorf("repository: unsupported parsed object type %T", parsed)
 	}
 }
 
 // ReadStoredBlob reads and parses a blob object by ID.
-func (repo *Repository) ReadStoredBlob(id objectid.ObjectID) (*objectstored.StoredBlob, error) {
-	stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredBlob(id objectid.ObjectID) (*stored.StoredBlob, error) {
+	s, err := repo.ReadStored(id)
 	if err != nil {
 		return nil, err
 	}
 
-	blob, ok := stored.(*objectstored.StoredBlob)
+	blob, ok := s.(*stored.StoredBlob)
 	if !ok {
-		return nil, fmt.Errorf("repository: expected blob object %s, got %v", id, stored.Object().ObjectType())
+		return nil, fmt.Errorf("repository: expected blob object %s, got %v", id, s.Object().ObjectType())
 	}
 
 	return blob, nil
 }
 
 // ReadStoredTree reads and parses a tree object by ID.
-func (repo *Repository) ReadStoredTree(id objectid.ObjectID) (*objectstored.StoredTree, error) {
-	stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredTree(id objectid.ObjectID) (*stored.StoredTree, error) {
+	s, err := repo.ReadStored(id)
 	if err != nil {
 		return nil, err
 	}
 
-	tree, ok := stored.(*objectstored.StoredTree)
+	tree, ok := s.(*stored.StoredTree)
 	if !ok {
-		return nil, fmt.Errorf("repository: expected tree object %s, got %v", id, stored.Object().ObjectType())
+		return nil, fmt.Errorf("repository: expected tree object %s, got %v", id, s.Object().ObjectType())
 	}
 
 	return tree, nil
 }
 
 // ReadStoredCommit reads and parses a commit object by ID.
-func (repo *Repository) ReadStoredCommit(id objectid.ObjectID) (*objectstored.StoredCommit, error) {
-	stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredCommit(id objectid.ObjectID) (*stored.StoredCommit, error) {
+	s, err := repo.ReadStored(id)
 	if err != nil {
 		return nil, err
 	}
 
-	commit, ok := stored.(*objectstored.StoredCommit)
+	commit, ok := s.(*stored.StoredCommit)
 	if !ok {
-		return nil, fmt.Errorf("repository: expected commit object %s, got %v", id, stored.Object().ObjectType())
+		return nil, fmt.Errorf("repository: expected commit object %s, got %v", id, s.Object().ObjectType())
 	}
 
 	return commit, nil
 }
 
 // ReadStoredTag reads and parses a tag object by ID.
-func (repo *Repository) ReadStoredTag(id objectid.ObjectID) (*objectstored.StoredTag, error) {
-	stored, err := repo.ReadStored(id)
+func (repo *Repository) ReadStoredTag(id objectid.ObjectID) (*stored.StoredTag, error) {
+	s, err := repo.ReadStored(id)
 	if err != nil {
 		return nil, err
 	}
 
-	tag, ok := stored.(*objectstored.StoredTag)
+	tag, ok := s.(*stored.StoredTag)
 	if !ok {
-		return nil, fmt.Errorf("repository: expected tag object %s, got %v", id, stored.Object().ObjectType())
+		return nil, fmt.Errorf("repository: expected tag object %s, got %v", id, s.Object().ObjectType())
 	}
 
 	return tag, nil
diff --git a/repository/tree.go b/repository/tree.go
index d4ef529e..ce3e96e4 100644
--- a/repository/tree.go
+++ b/repository/tree.go
@@ -5,14 +5,14 @@ import (
 	"fmt"
 
 	"codeberg.org/lindenii/furgit/object"
-	"codeberg.org/lindenii/furgit/objectstored"
+	"codeberg.org/lindenii/furgit/object/stored"
 )
 
 // ResolveTreeEntry resolves one path within a stored root tree.
 //
 // parts must contain at least one path segment. Intermediate segments must be
 // tree entries.
-func (repo *Repository) ResolveTreeEntry(tree *objectstored.StoredTree, parts [][]byte) (object.TreeEntry, error) {
+func (repo *Repository) ResolveTreeEntry(tree *stored.StoredTree, parts [][]byte) (object.TreeEntry, error) {
 	if tree == nil {
 		return object.TreeEntry{}, errors.New("repository: nil root tree")
 	}