repository: Object->&Store, Refs->RefStore

11 files changed, 72 insertions, 72 deletions

diff --git a/cmd/receivepack9418/conn.go b/cmd/receivepack9418/conn.go
index 755cf022..008a8a45 100644
--- a/cmd/receivepack9418/conn.go
+++ b/cmd/receivepack9418/conn.go
@@ -57,8 +57,8 @@ func (srv *server) handleConn(conn net.Conn) {
 	opts := receivepack.Options{
 		GitProtocol:     gitProtocol,
 		Algorithm:       srv.repo.Algorithm(),
-		Refs:            srv.repo.Refs(),
-		ExistingObjects: srv.repo.Objects(),
+		Refs:            srv.repo.RefStore(),
+		ExistingObjects: srv.repo.ObjectStore(),
 		ObjectIngress:   objectIngress,
 	}
 
diff --git a/cmd/show-object/resolve.go b/cmd/show-object/resolve.go
index eaf2c102..22afe70c 100644
--- a/cmd/show-object/resolve.go
+++ b/cmd/show-object/resolve.go
@@ -13,7 +13,7 @@ func resolveInput(repo *repository.Repository, input string) (objectid.ObjectID,
 		return id, nil
 	}
 
-	resolved, err := repo.Refs().ResolveToDetached(input)
+	resolved, err := repo.RefStore().ResolveToDetached(input)
 	if err != nil {
 		return objectid.ObjectID{}, err
 	}
diff --git a/internal/testgit/repo_open_object_store.go b/internal/testgit/repo_open_object_store.go
index 42dc370c..256ee54a 100644
--- a/internal/testgit/repo_open_object_store.go
+++ b/internal/testgit/repo_open_object_store.go
@@ -25,5 +25,5 @@ func (testRepo *TestRepo) OpenObjectStore(tb testing.TB) objectstore.Reader {
 		_ = repo.Close()
 	})
 
-	return repo.Objects()
+	return repo.ObjectStore()
 }
diff --git a/network/receivepack/int_test.go b/network/receivepack/int_test.go
index 352bbe7b..2440f9c8 100644
--- a/network/receivepack/int_test.go
+++ b/network/receivepack/int_test.go
@@ -47,8 +47,8 @@ func TestReceivePackDeleteOnlyAtomicDeleteSucceeds(t *testing.T) {
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			GitProtocol:     "",
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -59,7 +59,7 @@ func TestReceivePackDeleteOnlyAtomicDeleteSucceeds(t *testing.T) {
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/main")
+		_, err = repo.RefStore().Resolve("refs/heads/main")
 		if err == nil {
 			t.Fatal("refs/heads/main still exists after delete push")
 		}
@@ -97,8 +97,8 @@ func TestReceivePackDeleteOnlyNonAtomicAppliesIndependentDeletes(t *testing.T) {
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			GitProtocol:     "",
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -109,12 +109,12 @@ func TestReceivePackDeleteOnlyNonAtomicAppliesIndependentDeletes(t *testing.T) {
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/main")
+		_, err = repo.RefStore().Resolve("refs/heads/main")
 		if err != nil {
 			t.Fatalf("Resolve(main): %v", err)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/topic")
+		_, err = repo.RefStore().Resolve("refs/heads/topic")
 		if err == nil {
 			t.Fatal("refs/heads/topic still exists after successful delete")
 		}
@@ -152,8 +152,8 @@ func TestReceivePackDeleteOnlyAtomicFailureLeavesAllRefsUntouched(t *testing.T)
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			GitProtocol:     "",
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -164,12 +164,12 @@ func TestReceivePackDeleteOnlyAtomicFailureLeavesAllRefsUntouched(t *testing.T)
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/main")
+		_, err = repo.RefStore().Resolve("refs/heads/main")
 		if err != nil {
 			t.Fatalf("Resolve(main): %v", err)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/topic")
+		_, err = repo.RefStore().Resolve("refs/heads/topic")
 		if err != nil {
 			t.Fatalf("Resolve(topic): %v", err)
 		}
@@ -199,8 +199,8 @@ func TestReceivePackAdvertisesResolvedHEAD(t *testing.T) {
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -252,8 +252,8 @@ func TestReceivePackWithoutReportStatusWritesNoStatusPayload(t *testing.T) {
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -292,8 +292,8 @@ func testReceivePackProtocolFallback(t *testing.T, gitProtocol string) {
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			GitProtocol:     gitProtocol,
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -330,8 +330,8 @@ func TestReceivePackPackRequestWithoutObjectIngressReportsNotConfigured(t *testi
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -379,8 +379,8 @@ func TestReceivePackPackCreatePromotesObjectsAndUpdatesRef(t *testing.T) {
 			io.MultiReader(strings.NewReader(input.String()), packStream),
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 			},
 		)
@@ -395,7 +395,7 @@ func TestReceivePackPackCreatePromotesObjectsAndUpdatesRef(t *testing.T) {
 
 		reopened := receiver.OpenRepository(t)
 
-		resolved, err := reopened.Refs().ResolveToDetached("refs/heads/main")
+		resolved, err := reopened.RefStore().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(main): %v", err)
 		}
@@ -451,8 +451,8 @@ func TestReceivePackHookSeesQuarantinedObjectsAndCanRejectBeforePromotion(t *tes
 			io.MultiReader(strings.NewReader(input.String()), packStream),
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 				Hook: func(ctx context.Context, req receivepack.HookRequest) ([]receivepack.UpdateDecision, error) {
 					hookCalled = true
@@ -491,7 +491,7 @@ func TestReceivePackHookSeesQuarantinedObjectsAndCanRejectBeforePromotion(t *tes
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/main")
+		_, err = repo.RefStore().Resolve("refs/heads/main")
 		if err == nil {
 			t.Fatal("refs/heads/main exists after hook rejection")
 		}
@@ -532,8 +532,8 @@ func TestReceivePackHookCanRejectSubsetOfNonAtomicDeleteOnlyPush(t *testing.T) {
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 			Hook: func(ctx context.Context, req receivepack.HookRequest) ([]receivepack.UpdateDecision, error) {
 				return []receivepack.UpdateDecision{
 					{Accept: false, Message: "leave main alone"},
@@ -550,12 +550,12 @@ func TestReceivePackHookCanRejectSubsetOfNonAtomicDeleteOnlyPush(t *testing.T) {
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/main")
+		_, err = repo.RefStore().Resolve("refs/heads/main")
 		if err != nil {
 			t.Fatalf("Resolve(main): %v", err)
 		}
 
-		_, err = repo.Refs().Resolve("refs/heads/topic")
+		_, err = repo.RefStore().Resolve("refs/heads/topic")
 		if err == nil {
 			t.Fatal("refs/heads/topic still exists after successful delete")
 		}
@@ -587,8 +587,8 @@ func TestReceivePackHookProgressUsesSideBand64K(t *testing.T) {
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 			Hook: func(ctx context.Context, req receivepack.HookRequest) ([]receivepack.UpdateDecision, error) {
 				_, err := io.WriteString(req.IO.Progress, "hook says hello\n")
 				if err != nil {
@@ -684,8 +684,8 @@ func TestReceivePackPredefinedRejectForcePushHookRejectsNonFastForward(t *testin
 			io.MultiReader(strings.NewReader(input.String()), packStream),
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 				Hook:            receivepackhooks.RejectForcePush(),
 			},
@@ -699,7 +699,7 @@ func TestReceivePackPredefinedRejectForcePushHookRejectsNonFastForward(t *testin
 			t.Fatalf("unexpected receive-pack output %q", got)
 		}
 
-		resolved, err := repo.Refs().ResolveToDetached("refs/heads/main")
+		resolved, err := repo.RefStore().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(main): %v", err)
 		}
@@ -735,8 +735,8 @@ func TestReceivePackReportStatusV2IncludesRefDetails(t *testing.T) {
 
 		err := receivepack.ReceivePack(context.Background(), &output, strings.NewReader(input.String()), receivepack.Options{
 			Algorithm:       algo,
-			Refs:            repo.Refs(),
-			ExistingObjects: repo.Objects(),
+			Refs:            repo.RefStore(),
+			ExistingObjects: repo.ObjectStore(),
 		})
 		if err != nil {
 			t.Fatalf("ReceivePack: %v", err)
@@ -776,8 +776,8 @@ func TestReceivePackGitPushCreatesBranch(t *testing.T) {
 			sender,
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 			},
 			"push", "--porcelain", "fd::3,4/test", "refs/heads/main:refs/heads/main",
@@ -790,7 +790,7 @@ func TestReceivePackGitPushCreatesBranch(t *testing.T) {
 			t.Fatalf("ReceivePack: %v", serverErr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
+		resolved, err := receiver.OpenRepository(t).RefStore().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(main): %v", err)
 		}
@@ -826,8 +826,8 @@ func TestReceivePackGitPushRefUpdateWithoutNewObjectsSucceeds(t *testing.T) {
 			sender,
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 			},
 			"push", "--porcelain", "fd::3,4/test", "refs/heads/main:refs/heads/topic",
@@ -840,7 +840,7 @@ func TestReceivePackGitPushRefUpdateWithoutNewObjectsSucceeds(t *testing.T) {
 			t.Fatalf("ReceivePack: %v", serverErr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/topic")
+		resolved, err := receiver.OpenRepository(t).RefStore().ResolveToDetached("refs/heads/topic")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(topic): %v", err)
 		}
@@ -874,8 +874,8 @@ func TestReceivePackGitPushAtomicDelete(t *testing.T) {
 			sender,
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 			},
 			"push", "--porcelain", "--atomic", "fd::3,4/test", ":refs/heads/main",
 		)
@@ -887,7 +887,7 @@ func TestReceivePackGitPushAtomicDelete(t *testing.T) {
 			t.Fatalf("ReceivePack: %v", serverErr)
 		}
 
-		_, err := receiver.OpenRepository(t).Refs().Resolve("refs/heads/main")
+		_, err := receiver.OpenRepository(t).RefStore().Resolve("refs/heads/main")
 		if err == nil {
 			t.Fatal("refs/heads/main still exists after delete push")
 		}
@@ -922,8 +922,8 @@ func TestReceivePackGitPushRejectsForcedUpdateViaHook(t *testing.T) {
 			sender,
 			receivepack.Options{
 				Algorithm:       algo,
-				Refs:            repo.Refs(),
-				ExistingObjects: repo.Objects(),
+				Refs:            repo.RefStore(),
+				ExistingObjects: repo.ObjectStore(),
 				ObjectIngress:   objectIngress,
 				Hook:            receivepackhooks.RejectForcePush(),
 			},
@@ -941,7 +941,7 @@ func TestReceivePackGitPushRejectsForcedUpdateViaHook(t *testing.T) {
 			t.Fatalf("git push output missing non-fast-forward message\nstdout=%s\nstderr=%s", stdout, stderr)
 		}
 
-		resolved, err := receiver.OpenRepository(t).Refs().ResolveToDetached("refs/heads/main")
+		resolved, err := receiver.OpenRepository(t).RefStore().ResolveToDetached("refs/heads/main")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(main): %v", err)
 		}
diff --git a/object/fetch/treefs_test.go b/object/fetch/treefs_test.go
index ba5d4127..a4f28a01 100644
--- a/object/fetch/treefs_test.go
+++ b/object/fetch/treefs_test.go
@@ -41,7 +41,7 @@ func TestTreeFS(t *testing.T) {
 
 		defer func() { _ = repo.Close() }()
 
-		fetcher := fetch.New(repo.Objects())
+		fetcher := fetch.New(repo.ObjectStore())
 
 		treeFS, err := fetcher.TreeFS(commitID)
 		if err != nil {
diff --git a/object/store/packed/internal/ingest/ingest_test.go b/object/store/packed/internal/ingest/ingest_test.go
index c99afe65..1631ec34 100644
--- a/object/store/packed/internal/ingest/ingest_test.go
+++ b/object/store/packed/internal/ingest/ingest_test.go
@@ -270,7 +270,7 @@ func TestIngestThinPackWithFixThin(t *testing.T) {
 		result, err := ingest.WritePack(packRoot, algo, bytes.NewReader(thinPack), ingest.Options{
 			FixThin:            true,
 			WriteRev:           true,
-			ThinBase:           receiverRepo.Objects(),
+			ThinBase:           receiverRepo.ObjectStore(),
 			RequireTrailingEOF: true,
 		})
 		if err != nil {
diff --git a/repository/objects.go b/repository/objects.go
index 2527363a..b1e975ee 100644
--- a/repository/objects.go
+++ b/repository/objects.go
@@ -81,9 +81,9 @@ func openObjectStore(
 	return objects, objectsRoot, objectsPackRoot, objectsLoose, objectsPacked, nil
 }
 
-// Objects returns the configured object store.
+// ObjectStore returns the configured object store.
 //
-// Use Objects for direct object-ID lookups, object headers, sizes, raw object
+// Use ObjectStore for direct object-ID lookups, object headers, sizes, raw object
 // bytes, streamed object contents, object writes, pack ingestion, and
 // coordinated quarantines. Callers who want typed object values should usually
 // prefer [Repository.Fetcher].
@@ -91,7 +91,7 @@ func openObjectStore(
 // Labels: Life-Parent.
 //
 //nolint:ireturn
-func (repo *Repository) Objects() interface {
+func (repo *Repository) ObjectStore() interface {
 	objectstore.Reader
 	objectstore.Writer
 	objectstore.Quarantiner
diff --git a/repository/refs.go b/repository/refs.go
index d66ae752..ab983baf 100644
--- a/repository/refs.go
+++ b/repository/refs.go
@@ -2,16 +2,16 @@ package repository
 
 import refstore "codeberg.org/lindenii/furgit/ref/store"
 
-// Refs returns the configured ref store.
+// RefStore returns the configured ref store.
 //
-// Use Refs when starting from branch names, tags, HEAD, or other references.
+// Use RefStore when starting from branch names, tags, HEAD, or other references.
 // A common pattern is to resolve a reference first and then pass the resulting
-// object ID to [Repository.Fetcher] or [Repository.Objects].
+// object ID to [Repository.Fetcher] or [Repository.ObjectStore].
 //
 // Labels: Life-Parent.
 //
 //nolint:ireturn
-func (repo *Repository) Refs() interface {
+func (repo *Repository) RefStore() interface {
 	refstore.Reader
 	refstore.Transactioner
 	refstore.Batcher
diff --git a/repository/refs_test.go b/repository/refs_test.go
index d01dda19..cde0e94e 100644
--- a/repository/refs_test.go
+++ b/repository/refs_test.go
@@ -29,7 +29,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
 			t.Fatalf("Algorithm = %v, want %v", repo.Algorithm(), algo)
 		}
 
-		headerType, headerSize, err := repo.Objects().ReadHeader(commitID)
+		headerType, headerSize, err := repo.ObjectStore().ReadHeader(commitID)
 		if err != nil {
 			t.Fatalf("ReadHeader(commit): %v", err)
 		}
@@ -42,7 +42,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
 			t.Fatalf("ReadHeader(commit) size = %d, want > 0", headerSize)
 		}
 
-		resolved, err := repo.Refs().Resolve("refs/heads/main")
+		resolved, err := repo.RefStore().Resolve("refs/heads/main")
 		if err != nil {
 			t.Fatalf("Resolve(refs/heads/main): %v", err)
 		}
@@ -56,7 +56,7 @@ func TestOpenFilesRefFormat(t *testing.T) {
 			t.Fatalf("Resolve(refs/heads/main) id = %s, want %s", detached.ID, commitID)
 		}
 
-		head, err := repo.Refs().ResolveToDetached("HEAD")
+		head, err := repo.RefStore().ResolveToDetached("HEAD")
 		if err != nil {
 			t.Fatalf("ResolveToDetached(HEAD): %v", err)
 		}
@@ -102,7 +102,7 @@ func assertResolveToDetached(t *testing.T, repoHarness *testgit.TestRepo, name s
 
 	repo := repoHarness.OpenRepository(t)
 
-	resolved, err := repo.Refs().ResolveToDetached(name)
+	resolved, err := repo.RefStore().ResolveToDetached(name)
 	if err != nil {
 		t.Fatalf("ResolveToDetached(%s): %v", name, err)
 	}
diff --git a/repository/traversal_test.go b/repository/traversal_test.go
index 5f75eb5b..034119ac 100644
--- a/repository/traversal_test.go
+++ b/repository/traversal_test.go
@@ -147,7 +147,7 @@ func walkRepositoryFromRoot(t *testing.T, root *os.Root, label string) {
 
 	defer func() { _ = repo.Close() }()
 
-	head, err := repo.Refs().ResolveToDetached("HEAD")
+	head, err := repo.RefStore().ResolveToDetached("HEAD")
 	if err != nil {
 		t.Fatalf("ResolveRefFully(HEAD): %v", err)
 	}
diff --git a/repository/write_loose_test.go b/repository/write_loose_test.go
index d1fa479c..218a70cd 100644
--- a/repository/write_loose_test.go
+++ b/repository/write_loose_test.go
@@ -23,7 +23,7 @@ func TestWriteLooseBytesContent(t *testing.T) {
 
 		content := []byte("write-loose-bytes-content\n")
 
-		gotID, err := repo.Objects().WriteBytesContent(objecttype.TypeBlob, content)
+		gotID, err := repo.ObjectStore().WriteBytesContent(objecttype.TypeBlob, content)
 		if err != nil {
 			t.Fatalf("WriteLooseBytesContent: %v", err)
 		}
@@ -33,7 +33,7 @@ func TestWriteLooseBytesContent(t *testing.T) {
 			t.Fatalf("WriteLooseBytesContent id = %s, want %s", gotID, wantID)
 		}
 
-		ty, gotContent, err := repo.Objects().ReadBytesContent(gotID)
+		ty, gotContent, err := repo.ObjectStore().ReadBytesContent(gotID)
 		if err != nil {
 			t.Fatalf("ReadStoredBytesContent: %v", err)
 		}
@@ -62,7 +62,7 @@ func TestWriteLooseReaderContent(t *testing.T) {
 
 		content := []byte("write-loose-reader-content\n")
 
-		gotID, err := repo.Objects().WriteReaderContent(objecttype.TypeBlob, int64(len(content)), bytes.NewReader(content))
+		gotID, err := repo.ObjectStore().WriteReaderContent(objecttype.TypeBlob, int64(len(content)), bytes.NewReader(content))
 		if err != nil {
 			t.Fatalf("WriteLooseReaderContent: %v", err)
 		}
@@ -87,12 +87,12 @@ func TestWriteLooseFull(t *testing.T) {
 
 		repo := repoHarness.OpenRepository(t)
 
-		raw, err := repo.Objects().ReadBytesFull(commitID)
+		raw, err := repo.ObjectStore().ReadBytesFull(commitID)
 		if err != nil {
 			t.Fatalf("ReadStoredBytesFull: %v", err)
 		}
 
-		idFromBytes, err := repo.Objects().WriteBytesFull(raw)
+		idFromBytes, err := repo.ObjectStore().WriteBytesFull(raw)
 		if err != nil {
 			t.Fatalf("WriteLooseBytesFull: %v", err)
 		}
@@ -101,7 +101,7 @@ func TestWriteLooseFull(t *testing.T) {
 			t.Fatalf("WriteLooseBytesFull id = %s, want %s", idFromBytes, commitID)
 		}
 
-		idFromReader, err := repo.Objects().WriteReaderFull(bytes.NewReader(raw))
+		idFromReader, err := repo.ObjectStore().WriteReaderFull(bytes.NewReader(raw))
 		if err != nil {
 			t.Fatalf("WriteLooseReaderFull: %v", err)
 		}