revert multi-cid store (#475)

1 files changed, 58 insertions, 111 deletions

diff --git a/src/zenserver/projectstore/projectstore.cpp b/src/zenserver/projectstore/projectstore.cpp
index 7463e9caa..a5ab24cfb 100644
--- a/src/zenserver/projectstore/projectstore.cpp
+++ b/src/zenserver/projectstore/projectstore.cpp
@@ -3832,7 +3832,7 @@ ProjectStore::Project::LastOplogAccessTime(std::string_view Oplog) const
 
 //////////////////////////////////////////////////////////////////////////
 
-ProjectStore::ProjectStore(GetCidStoreFunc&&	 GetCidStore,
+ProjectStore::ProjectStore(CidStore&			 Store,
 						   std::filesystem::path BasePath,
 						   GcManager&			 Gc,
 						   JobQueue&			 JobQueue,
@@ -3840,7 +3840,7 @@ ProjectStore::ProjectStore(GetCidStoreFunc&&	 GetCidStore,
 						   const Configuration&	 Config)
 : m_Log(logging::Get("project"))
 , m_Gc(Gc)
-, m_GetCidStore(std::move(GetCidStore))
+, m_CidStore(Store)
 , m_JobQueue(JobQueue)
 , m_OpenProcessCache(InOpenProcessCache)
 , m_ProjectBasePath(BasePath)
@@ -4025,8 +4025,6 @@ ProjectStore::OpenProject(std::string_view ProjectId)
 		}
 	}
 
-	CidStore& ChunkStore = m_GetCidStore(ProjectId);
-
 	RwLock::ExclusiveLockScope _(m_ProjectsLock);
 	if (auto ProjIt = m_Projects.find(std::string{ProjectId}); ProjIt != m_Projects.end())
 	{
@@ -4043,7 +4041,7 @@ ProjectStore::OpenProject(std::string_view ProjectId)
 
 			Ref<Project>& Prj =
 				m_Projects
-					.try_emplace(std::string{ProjectId}, Ref<ProjectStore::Project>(new ProjectStore::Project(this, ChunkStore, BasePath)))
+					.try_emplace(std::string{ProjectId}, Ref<ProjectStore::Project>(new ProjectStore::Project(this, m_CidStore, BasePath)))
 					.first->second;
 			Prj->Identifier = ProjectId;
 			Prj->Read();
@@ -4070,14 +4068,12 @@ ProjectStore::NewProject(const std::filesystem::path& BasePath,
 	ZEN_MEMSCOPE(GetProjectstoreTag());
 	ZEN_TRACE_CPU("Store::NewProject");
 
-	CidStore& ChunkStore = m_GetCidStore(ProjectId);
-
 	RwLock::ExclusiveLockScope _(m_ProjectsLock);
 
 	ZEN_INFO("project '{}': creating project at '{}'", ProjectId, BasePath);
 
 	Ref<Project>& Prj =
-		m_Projects.try_emplace(std::string{ProjectId}, Ref<ProjectStore::Project>(new ProjectStore::Project(this, ChunkStore, BasePath)))
+		m_Projects.try_emplace(std::string{ProjectId}, Ref<ProjectStore::Project>(new ProjectStore::Project(this, m_CidStore, BasePath)))
 			.first->second;
 	Prj->Identifier		 = ProjectId;
 	Prj->RootDir		 = RootDir;
@@ -4806,7 +4802,7 @@ ProjectStore::GetChunk(const std::string_view ProjectId,
 	}
 
 	const IoHash Hash = IoHash::FromHexString(Cid);
-	OutChunk		  = Project->GetCidStore().FindChunkByCid(Hash);
+	OutChunk		  = m_CidStore.FindChunkByCid(Hash);
 
 	if (!OutChunk)
 	{
@@ -4869,7 +4865,7 @@ ProjectStore::PutChunk(const std::string_view ProjectId,
 	}
 
 	FoundLog->CaptureAddedAttachments(std::vector<IoHash>{Hash});
-	CidStore::InsertResult Result = Project->GetCidStore().AddChunk(Chunk, Hash);
+	CidStore::InsertResult Result = m_CidStore.AddChunk(Chunk, Hash);
 	return {Result.New ? HttpResponseCode::Created : HttpResponseCode::OK, {}};
 }
 
@@ -4898,19 +4894,18 @@ ProjectStore::GetChunks(const std::string_view ProjectId,
 	}
 	Project->TouchOplog(OplogId);
 
-	CidStore& ChunkStore = Project->GetCidStore();
-
 	if (RequestObject["chunks"sv].IsArray())
 	{
 		// Legacy full chunks only by rawhash
 
-		CbArrayView	   ChunksArray = RequestObject["chunks"sv].AsArrayView();
+		CbArrayView ChunksArray = RequestObject["chunks"sv].AsArrayView();
+
 		CbObjectWriter ResponseWriter;
 		ResponseWriter.BeginArray("chunks"sv);
 		for (CbFieldView FieldView : ChunksArray)
 		{
 			IoHash	 RawHash	 = FieldView.AsHash();
-			IoBuffer ChunkBuffer = ChunkStore.FindChunkByCid(RawHash);
+			IoBuffer ChunkBuffer = m_CidStore.FindChunkByCid(RawHash);
 			if (ChunkBuffer)
 			{
 				CompressedBuffer Compressed = CompressedBuffer::FromCompressedNoValidate(std::move(ChunkBuffer));
@@ -5062,7 +5057,7 @@ ProjectStore::GetChunks(const std::string_view ProjectId,
 				if (ChunkRequest.Input.Id.index() == 0)
 				{
 					const IoHash& ChunkHash = std::get<IoHash>(ChunkRequest.Input.Id);
-					IoBuffer	  Payload	= ChunkStore.FindChunkByCid(ChunkHash);
+					IoBuffer	  Payload	= m_CidStore.FindChunkByCid(ChunkHash);
 					if (Payload)
 					{
 						ChunkRequest.Output.Exists = true;
@@ -5249,7 +5244,7 @@ ProjectStore::WriteOplog(const std::string_view ProjectId, const std::string_vie
 		return {HttpResponseCode::BadRequest, "Invalid payload format"};
 	}
 
-	CidStore&							   ChunkStore = Project->GetCidStore();
+	CidStore&							   ChunkStore = m_CidStore;
 	RwLock								   AttachmentsLock;
 	tsl::robin_set<IoHash, IoHash::Hasher> Attachments;
 
@@ -5355,7 +5350,7 @@ ProjectStore::ReadOplog(const std::string_view				  ProjectId,
 		}
 	}
 
-	CidStore& ChunkStore = Project->GetCidStore();
+	CidStore& ChunkStore = m_CidStore;
 
 	RemoteProjectStore::LoadContainerResult ContainerResult = BuildContainer(
 		ChunkStore,
@@ -5467,8 +5462,6 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 	}
 	Project->TouchOplog(OplogId);
 
-	CidStore& ChunkStore = Project->GetCidStore();
-
 	if (Method == "import"sv)
 	{
 		if (!AreDiskWritesAllowed())
@@ -5550,7 +5543,7 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 			}
 
 			Oplog->CaptureAddedAttachments(WriteRawHashes);
-			ChunkStore.AddChunks(WriteAttachmentBuffers, WriteRawHashes, CidStore::InsertMode::kCopyOnly);
+			m_CidStore.AddChunks(WriteAttachmentBuffers, WriteRawHashes, CidStore::InsertMode::kCopyOnly);
 		}
 		HttpReq.WriteResponse(HttpResponseCode::OK);
 		return true;
@@ -5723,14 +5716,14 @@ ProjectStore::Rpc(HttpServerRequest&	 HttpReq,
 			ResponseObj.EndArray();
 		}
 
-		// Ops that have moved chunks to a compressed buffer for storage in ChunkStore have been rewritten with references to the new
-		// chunk(s). Make sure we add the chunks to ChunkStore, and do it after we update the oplog so GC doesn't think we have
+		// Ops that have moved chunks to a compressed buffer for storage in m_CidStore have been rewritten with references to the new
+		// chunk(s). Make sure we add the chunks to m_CidStore, and do it after we update the oplog so GC doesn't think we have
 		// unreferenced chunks.
 		for (auto It : AddedChunks)
 		{
 			const IoHash&		   RawHash = It.first;
 			AddedChunk&			   Chunk   = It.second;
-			CidStore::InsertResult Result  = ChunkStore.AddChunk(Chunk.Buffer, RawHash);
+			CidStore::InsertResult Result  = m_CidStore.AddChunk(Chunk.Buffer, RawHash);
 			if (Result.New)
 			{
 				InlinedBytes += Chunk.RawSize;
@@ -5793,7 +5786,7 @@ ProjectStore::Export(Ref<ProjectStore::Project> Project, ProjectStore::Oplog& Op
 											  NiceBytes(MaxBlockSize),
 											  NiceBytes(MaxChunkEmbedSize)));
 
-			RemoteProjectStore::Result Result	= SaveOplog(Project->GetCidStore(),
+			RemoteProjectStore::Result Result	= SaveOplog(m_CidStore,
 															*ActualRemoteStore,
 															*Project.Get(),
 															*OplogPtr,
@@ -5838,12 +5831,11 @@ ProjectStore::Import(ProjectStore::Project& Project, ProjectStore::Oplog& Oplog,
 	}
 	std::shared_ptr<RemoteProjectStore> RemoteStore = std::move(RemoteStoreResult.Store);
 	RemoteProjectStore::RemoteStoreInfo StoreInfo	= RemoteStore->GetInfo();
-	CidStore&							ChunkStore	= Project.GetCidStore();
 
 	JobId JobId = m_JobQueue.QueueJob(
 		fmt::format("Import oplog '{}/{}'", Project.Identifier, Oplog.OplogId()),
 		[this,
-		 ChunkStore		   = &ChunkStore,
+		 ChunkStore		   = &m_CidStore,
 		 ActualRemoteStore = std::move(RemoteStore),
 		 OplogPtr		   = &Oplog,
 		 Force,
@@ -5855,7 +5847,7 @@ ProjectStore::Import(ProjectStore::Project& Project, ProjectStore::Oplog& Oplog,
 											  ActualRemoteStore->GetInfo().Description));
 
 			RemoteProjectStore::Result Result =
-				LoadOplog(*ChunkStore, *ActualRemoteStore, *OplogPtr, Force, IgnoreMissingAttachments, CleanOplog, &Context);
+				LoadOplog(m_CidStore, *ActualRemoteStore, *OplogPtr, Force, IgnoreMissingAttachments, CleanOplog, &Context);
 			auto Response = ConvertResult(Result);
 			ZEN_INFO("LoadOplog: Status: {} '{}'", ToString(Response.first), Response.second);
 			if (!IsHttpSuccessCode(Response.first))
@@ -6894,11 +6886,6 @@ namespace testutils {
 		return BuildChunksRequest<IoHash>(SkipData, "RawHash", Chunks, Ranges, ModTags);
 	}
 
-	ProjectStore::GetCidStoreFunc SingleChunkStore(CidStore& ChunkStore)
-	{
-		return [ChunkStore = &ChunkStore](std::string_view) -> CidStore& { return *ChunkStore; };
-	}
-
 }  // namespace testutils
 
 TEST_CASE("project.opkeys")
@@ -6961,18 +6948,13 @@ TEST_CASE("project.store.create")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::string_view	  ProjectName("proj1"sv);
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -6997,17 +6979,12 @@ TEST_CASE("project.store.lifetimes")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -7065,17 +7042,12 @@ TEST_CASE_TEMPLATE("project.store.export",
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		  = TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir	  = TempDir.Path() / "engine";
 	std::filesystem::path ProjectRootDir  = TempDir.Path() / "game";
@@ -7109,7 +7081,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 	std::shared_ptr<RemoteProjectStore> RemoteStore = CreateFileRemoteStore(Options);
 	RemoteProjectStore::RemoteStoreInfo StoreInfo	= RemoteStore->GetInfo();
 
-	RemoteProjectStore::Result ExportResult = SaveOplog(ChunkStore,
+	RemoteProjectStore::Result ExportResult = SaveOplog(CidStore,
 														*RemoteStore,
 														*Project.Get(),
 														*Oplog,
@@ -7126,7 +7098,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 	ProjectStore::Oplog* OplogImport = Project->NewOplog("oplog2", {});
 	CHECK(OplogImport != nullptr);
 
-	RemoteProjectStore::Result ImportResult = LoadOplog(ChunkStore,
+	RemoteProjectStore::Result ImportResult = LoadOplog(CidStore,
 														*RemoteStore,
 														*OplogImport,
 														/*Force*/ false,
@@ -7135,7 +7107,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 														nullptr);
 	CHECK(ImportResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportForceResult = LoadOplog(ChunkStore,
+	RemoteProjectStore::Result ImportForceResult = LoadOplog(CidStore,
 															 *RemoteStore,
 															 *OplogImport,
 															 /*Force*/ true,
@@ -7144,7 +7116,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 															 nullptr);
 	CHECK(ImportForceResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportCleanResult = LoadOplog(ChunkStore,
+	RemoteProjectStore::Result ImportCleanResult = LoadOplog(CidStore,
 															 *RemoteStore,
 															 *OplogImport,
 															 /*Force*/ false,
@@ -7153,7 +7125,7 @@ TEST_CASE_TEMPLATE("project.store.export",
 															 nullptr);
 	CHECK(ImportCleanResult.ErrorCode == 0);
 
-	RemoteProjectStore::Result ImportForceCleanResult = LoadOplog(ChunkStore,
+	RemoteProjectStore::Result ImportForceCleanResult = LoadOplog(CidStore,
 																  *RemoteStore,
 																  *OplogImport,
 																  /*Force*/ true,
@@ -7173,17 +7145,12 @@ TEST_CASE("project.store.gc")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine";
 
@@ -7379,17 +7346,12 @@ TEST_CASE("project.store.gc.prep")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas", .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore";
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root";
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine";
 
@@ -7432,7 +7394,7 @@ TEST_CASE("project.store.gc.prep")
 	// Equivalent of a `prep` existance check call
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7446,7 +7408,7 @@ TEST_CASE("project.store.gc.prep")
 	// If a gc comes in between our prep and op write the chunks will be removed
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(!ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(!CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7466,7 +7428,7 @@ TEST_CASE("project.store.gc.prep")
 
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7480,7 +7442,7 @@ TEST_CASE("project.store.gc.prep")
 	// Attachments should now be retained
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7494,7 +7456,7 @@ TEST_CASE("project.store.gc.prep")
 	// Attachments should now be retained across multiple GCs if retain time is still valud
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7506,7 +7468,7 @@ TEST_CASE("project.store.gc.prep")
 	}
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 	{
 		Ref<ProjectStore::Project> Project1 = ProjectStore.OpenProject("proj1"sv);
@@ -7523,7 +7485,7 @@ TEST_CASE("project.store.gc.prep")
 
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(!ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(!CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	{
@@ -7556,7 +7518,7 @@ TEST_CASE("project.store.gc.prep")
 	}
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	Sleep(200);
@@ -7571,7 +7533,7 @@ TEST_CASE("project.store.gc.prep")
 	}
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 
 	// This pass the retention time has expired and the last GC pass cleared the entries
@@ -7585,7 +7547,7 @@ TEST_CASE("project.store.gc.prep")
 
 	for (auto Attachment : OpAttachments)
 	{
-		CHECK(!ChunkStore.ContainsChunk(Attachment.second.DecodeRawHash()));
+		CHECK(!CidStore.ContainsChunk(Attachment.second.DecodeRawHash()));
 	}
 }
 
@@ -7599,17 +7561,12 @@ TEST_CASE("project.store.rpc.getchunks")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine"sv;
 
@@ -8526,17 +8483,12 @@ TEST_CASE("project.store.partial.read")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "engine"sv;
 
@@ -8709,17 +8661,12 @@ TEST_CASE("project.store.iterateoplog")
 	auto				  JobQueue = MakeJobQueue(1, ""sv);
 	OpenProcessCache	  ProcessCache;
 	GcManager			  Gc;
-	CidStore			  ChunkStore(Gc);
+	CidStore			  CidStore(Gc);
 	CidStoreConfiguration CidConfig = {.RootDirectory = TempDir.Path() / "cas"sv, .TinyValueThreshold = 1024, .HugeValueThreshold = 4096};
-	ChunkStore.Initialize(CidConfig);
+	CidStore.Initialize(CidConfig);
 
 	std::filesystem::path BasePath = TempDir.Path() / "projectstore"sv;
-	ProjectStore		  ProjectStore(testutils::SingleChunkStore(ChunkStore),
-							   BasePath,
-							   Gc,
-							   *JobQueue,
-							   ProcessCache,
-							   ProjectStore::Configuration{});
+	ProjectStore		  ProjectStore(CidStore, BasePath, Gc, *JobQueue, ProcessCache, ProjectStore::Configuration{});
 	std::filesystem::path RootDir		= TempDir.Path() / "root"sv;
 	std::filesystem::path EngineRootDir = TempDir.Path() / "enginesv";