object/fetch: Receiver should use name fetcher

6 files changed, 36 insertions, 36 deletions

diff --git a/object/fetch/blob.go b/object/fetch/blob.go
index ee5bae1c..199bede3 100644
--- a/object/fetch/blob.go
+++ b/object/fetch/blob.go
@@ -14,8 +14,8 @@ import (
 // ExactBlob reads, parses, and wraps the blob at id.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error) {
-	parsed, err := r.parseObject(id)
+func (fetcher *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error) {
+	parsed, err := fetcher.parseObject(id)
 	if err != nil {
 		return nil, err
 	}
@@ -32,16 +32,16 @@ func (r *Fetcher) ExactBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error)
 // together with its content size in bytes.
 //
 // Labels: Life-Parent, Close-Caller.
-func (r *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) {
-	return r.exactReader(id, typ.TypeBlob)
+func (fetcher *Fetcher) ExactBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) {
+	return fetcher.exactReader(id, typ.TypeBlob)
 }
 
 // PeelToBlob peels tags until it reaches a blob.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) PeelToBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error) {
+func (fetcher *Fetcher) PeelToBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error) {
 	for {
-		obj, err := r.ExactObject(id)
+		obj, err := fetcher.ExactObject(id)
 		if err != nil {
 			return nil, err
 		}
@@ -58,9 +58,9 @@ func (r *Fetcher) PeelToBlob(id oid.ObjectID) (*stored.Stored[*blob.Blob], error
 }
 
 // PeelToBlobID peels tags until it reaches a blob object ID.
-func (r *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) {
+func (fetcher *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) {
 	for {
-		ty, _, err := r.Header(id)
+		ty, _, err := fetcher.Header(id)
 		if err != nil {
 			return oid.ObjectID{}, err
 		}
@@ -69,7 +69,7 @@ func (r *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) {
 		case typ.TypeBlob:
 			return id, nil
 		case typ.TypeTag:
-			tag, err := r.ExactTag(id)
+			tag, err := fetcher.ExactTag(id)
 			if err != nil {
 				return oid.ObjectID{}, err
 			}
@@ -87,11 +87,11 @@ func (r *Fetcher) PeelToBlobID(id oid.ObjectID) (oid.ObjectID, error) {
 // together with its content size in bytes.
 //
 // Labels: Life-Parent, Close-Caller.
-func (r *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) {
-	blobID, err := r.PeelToBlobID(id)
+func (fetcher *Fetcher) PeelToBlobReader(id oid.ObjectID) (io.ReadCloser, int64, error) {
+	blobID, err := fetcher.PeelToBlobID(id)
 	if err != nil {
 		return nil, 0, err
 	}
 
-	return r.ExactBlobReader(blobID)
+	return fetcher.ExactBlobReader(blobID)
 }
diff --git a/object/fetch/commit.go b/object/fetch/commit.go
index ad4d91d3..5d5af892 100644
--- a/object/fetch/commit.go
+++ b/object/fetch/commit.go
@@ -12,8 +12,8 @@ import (
 // ExactCommit reads, parses, and wraps the commit at id.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) ExactCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit], error) {
-	parsed, err := r.parseObject(id)
+func (fetcher *Fetcher) ExactCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit], error) {
+	parsed, err := fetcher.parseObject(id)
 	if err != nil {
 		return nil, err
 	}
@@ -29,9 +29,9 @@ func (r *Fetcher) ExactCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit],
 // PeelToCommit peels tags until it reaches a commit.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) PeelToCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit], error) {
+func (fetcher *Fetcher) PeelToCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit], error) {
 	for {
-		obj, err := r.ExactObject(id)
+		obj, err := fetcher.ExactObject(id)
 		if err != nil {
 			return nil, err
 		}
@@ -48,9 +48,9 @@ func (r *Fetcher) PeelToCommit(id oid.ObjectID) (*stored.Stored[*commit.Commit],
 }
 
 // PeelToCommitID peels tags until it reaches a commit object ID.
-func (r *Fetcher) PeelToCommitID(id oid.ObjectID) (oid.ObjectID, error) {
+func (fetcher *Fetcher) PeelToCommitID(id oid.ObjectID) (oid.ObjectID, error) {
 	for {
-		ty, _, err := r.Header(id)
+		ty, _, err := fetcher.Header(id)
 		if err != nil {
 			return oid.ObjectID{}, err
 		}
@@ -59,7 +59,7 @@ func (r *Fetcher) PeelToCommitID(id oid.ObjectID) (oid.ObjectID, error) {
 		case typ.TypeCommit:
 			return id, nil
 		case typ.TypeTag:
-			tag, err := r.ExactTag(id)
+			tag, err := fetcher.ExactTag(id)
 			if err != nil {
 				return oid.ObjectID{}, err
 			}
diff --git a/object/fetch/object.go b/object/fetch/object.go
index 0ca88bfc..4c999871 100644
--- a/object/fetch/object.go
+++ b/object/fetch/object.go
@@ -12,8 +12,8 @@ import (
 // its concrete object kind.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) ExactObject(id oid.ObjectID) (*stored.Stored[object.Object], error) {
-	parsed, err := r.parseObject(id)
+func (fetcher *Fetcher) ExactObject(id oid.ObjectID) (*stored.Stored[object.Object], error) {
+	parsed, err := fetcher.parseObject(id)
 	if err != nil {
 		return nil, err
 	}
@@ -21,8 +21,8 @@ func (r *Fetcher) ExactObject(id oid.ObjectID) (*stored.Stored[object.Object], e
 	return stored.New(id, parsed), nil
 }
 
-func (r *Fetcher) parseObject(id oid.ObjectID) (object.Object, error) {
-	ty, content, err := r.store.ReadBytesContent(id)
+func (fetcher *Fetcher) parseObject(id oid.ObjectID) (object.Object, error) {
+	ty, content, err := fetcher.store.ReadBytesContent(id)
 	if err != nil {
 		return nil, wrapObjectReadError(id, err)
 	}
diff --git a/object/fetch/reader.go b/object/fetch/reader.go
index 197efd84..5503246a 100644
--- a/object/fetch/reader.go
+++ b/object/fetch/reader.go
@@ -10,8 +10,8 @@ import (
 
 // exactReader reads one object's content stream
 // and verifies that its header type matches wantType.
-func (r *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, int64, error) {
-	gotType, size, rc, err := r.store.ReadReaderContent(id)
+func (fetcher *Fetcher) exactReader(id oid.ObjectID, wantType typ.Type) (io.ReadCloser, int64, error) {
+	gotType, size, rc, err := fetcher.store.ReadReaderContent(id)
 	if err != nil {
 		return nil, 0, wrapObjectReadError(id, err)
 	}
diff --git a/object/fetch/tag.go b/object/fetch/tag.go
index 422b818d..0b01a94c 100644
--- a/object/fetch/tag.go
+++ b/object/fetch/tag.go
@@ -11,8 +11,8 @@ import (
 // ExactTag reads, parses, and wraps the tag at id.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) ExactTag(id oid.ObjectID) (*stored.Stored[*tag.Tag], error) {
-	parsed, err := r.parseObject(id)
+func (fetcher *Fetcher) ExactTag(id oid.ObjectID) (*stored.Stored[*tag.Tag], error) {
+	parsed, err := fetcher.parseObject(id)
 	if err != nil {
 		return nil, err
 	}
diff --git a/object/fetch/tree.go b/object/fetch/tree.go
index ef0f9e77..add41274 100644
--- a/object/fetch/tree.go
+++ b/object/fetch/tree.go
@@ -13,8 +13,8 @@ import (
 // ExactTree reads, parses, and wraps the tree at id.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) {
-	parsed, err := r.parseObject(id)
+func (fetcher *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) {
+	parsed, err := fetcher.parseObject(id)
 	if err != nil {
 		return nil, err
 	}
@@ -31,9 +31,9 @@ func (r *Fetcher) ExactTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error)
 // commit, it returns the commit's root tree.
 //
 // Labels: Life-Parent.
-func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) {
+func (fetcher *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error) {
 	for {
-		obj, err := r.ExactObject(id)
+		obj, err := fetcher.ExactObject(id)
 		if err != nil {
 			return nil, err
 		}
@@ -42,7 +42,7 @@ func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error
 		case *tree.Tree:
 			return stored.New(id, parsed), nil
 		case *commit.Commit:
-			return r.ExactTree(parsed.Tree)
+			return fetcher.ExactTree(parsed.Tree)
 		case *tag.Tag:
 			id = parsed.TargetID
 		default:
@@ -53,9 +53,9 @@ func (r *Fetcher) PeelToTree(id oid.ObjectID) (*stored.Stored[*tree.Tree], error
 
 // PeelToTreeID peels tags until it reaches a tree object ID, or a commit whose
 // root tree object ID is then returned.
-func (r *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) {
+func (fetcher *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) {
 	for {
-		ty, _, err := r.Header(id)
+		ty, _, err := fetcher.Header(id)
 		if err != nil {
 			return oid.ObjectID{}, err
 		}
@@ -64,14 +64,14 @@ func (r *Fetcher) PeelToTreeID(id oid.ObjectID) (oid.ObjectID, error) {
 		case typ.TypeTree:
 			return id, nil
 		case typ.TypeCommit:
-			commit, err := r.ExactCommit(id)
+			commit, err := fetcher.ExactCommit(id)
 			if err != nil {
 				return oid.ObjectID{}, err
 			}
 
 			return commit.Object().Tree, nil
 		case typ.TypeTag:
-			tag, err := r.ExactTag(id)
+			tag, err := fetcher.ExactTag(id)
 			if err != nil {
 				return oid.ObjectID{}, err
 			}