remove zenutil dependency in zenremotestore (#547)

* remove dependency to zenutil/workerpools.h from remoteprojectstore.cpp
* remove dependency to zenutil/workerpools.h from buildstoragecache.cpp
* remove unneded include
* move jupiter helpers to zenremotestore
* move parallelwork to zencore
* remove zenutil dependency from zenremotestore
* clean up test project dependencies - use indirect dependencies

2 files changed, 21 insertions, 10 deletions

diff --git a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
index bfd4e433c..b198b7c99 100644
--- a/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/jupiterremoteprojectstore.cpp
@@ -8,8 +8,8 @@
 
 #include <zenhttp/httpclientauth.h>
 
-#include <zenutil/jupiter/jupiterclient.h>
-#include <zenutil/jupiter/jupitersession.h>
+#include <zenremotestore/jupiter/jupiterclient.h>
+#include <zenremotestore/jupiter/jupitersession.h>
 
 namespace zen {
 
diff --git a/src/zenremotestore/projectstore/remoteprojectstore.cpp b/src/zenremotestore/projectstore/remoteprojectstore.cpp
index c2e270909..d008d1452 100644
--- a/src/zenremotestore/projectstore/remoteprojectstore.cpp
+++ b/src/zenremotestore/projectstore/remoteprojectstore.cpp
@@ -15,7 +15,6 @@
 #include <zenhttp/httpcommon.h>
 #include <zenremotestore/chunking/chunkedfile.h>
 #include <zenstore/cidstore.h>
-#include <zenutil/workerpools.h>
 
 #include <unordered_map>
 
@@ -2307,6 +2306,7 @@ RemoteProjectStore::LoadContainerResult
 BuildContainer(CidStore&																	ChunkStore,
 			   ProjectStore::Project&														Project,
 			   ProjectStore::Oplog&															Oplog,
+			   WorkerThreadPool&															WorkerPool,
 			   size_t																		MaxBlockSize,
 			   size_t																		MaxChunksPerBlock,
 			   size_t																		MaxChunkEmbedSize,
@@ -2319,7 +2319,7 @@ BuildContainer(CidStore&																	ChunkStore,
 			   const std::function<void(std::vector<std::pair<IoHash, FetchChunkFunc>>&&)>& OnBlockChunks,
 			   bool																			EmbedLooseFiles)
 {
-	WorkerThreadPool& WorkerPool = GetLargeWorkerPool(EWorkloadType::Background);
+	//	WorkerThreadPool& WorkerPool = GetLargeWorkerPool(EWorkloadType::Background);
 
 	remotestore_impl::AsyncRemoteResult RemoteResult;
 	CbObject							ContainerObject = BuildContainer(ChunkStore,
@@ -2348,6 +2348,8 @@ SaveOplog(CidStore&				 ChunkStore,
 		  RemoteProjectStore&	 RemoteStore,
 		  ProjectStore::Project& Project,
 		  ProjectStore::Oplog&	 Oplog,
+		  WorkerThreadPool&		 NetworkWorkerPool,
+		  WorkerThreadPool&		 WorkerPool,
 		  size_t				 MaxBlockSize,
 		  size_t				 MaxChunksPerBlock,
 		  size_t				 MaxChunkEmbedSize,
@@ -2363,9 +2365,6 @@ SaveOplog(CidStore&				 ChunkStore,
 
 	remotestore_impl::UploadInfo Info;
 
-	WorkerThreadPool& WorkerPool		= GetLargeWorkerPool(EWorkloadType::Background);
-	WorkerThreadPool& NetworkWorkerPool = GetMediumWorkerPool(EWorkloadType::Background);
-
 	const RemoteProjectStore::RemoteStoreInfo RemoteStoreInfo = RemoteStore.GetInfo();
 
 	std::filesystem::path AttachmentTempPath;
@@ -2887,6 +2886,8 @@ RemoteProjectStore::Result
 LoadOplog(CidStore&			   ChunkStore,
 		  RemoteProjectStore&  RemoteStore,
 		  ProjectStore::Oplog& Oplog,
+		  WorkerThreadPool&	   NetworkWorkerPool,
+		  WorkerThreadPool&	   WorkerPool,
 		  bool				   ForceDownload,
 		  bool				   IgnoreMissingAttachments,
 		  bool				   CleanOplog,
@@ -2898,9 +2899,6 @@ LoadOplog(CidStore&			   ChunkStore,
 
 	Stopwatch Timer;
 
-	WorkerThreadPool& WorkerPool		= GetLargeWorkerPool(EWorkloadType::Background);
-	WorkerThreadPool& NetworkWorkerPool = GetSmallWorkerPool(EWorkloadType::Background);
-
 	std::unordered_set<IoHash, IoHash::Hasher> Attachments;
 	uint64_t								   BlockCountToDownload = 0;
 
@@ -3454,10 +3452,15 @@ TEST_CASE_TEMPLATE("project.store.export",
 	std::shared_ptr<RemoteProjectStore> RemoteStore = CreateFileRemoteStore(Options);
 	RemoteProjectStore::RemoteStoreInfo StoreInfo	= RemoteStore->GetInfo();
 
+	WorkerThreadPool WorkerPool(4);
+	WorkerThreadPool NetworkPool(2);
+
 	RemoteProjectStore::Result ExportResult = SaveOplog(CidStore,
 														*RemoteStore,
 														*Project.Get(),
 														*Oplog,
+														NetworkPool,
+														WorkerPool,
 														Options.MaxBlockSize,
 														Options.MaxChunksPerBlock,
 														Options.MaxChunkEmbedSize,
@@ -3475,6 +3478,8 @@ TEST_CASE_TEMPLATE("project.store.export",
 	RemoteProjectStore::Result ImportResult = LoadOplog(CidStore,
 														*RemoteStore,
 														*OplogImport,
+														NetworkPool,
+														WorkerPool,
 														/*Force*/ false,
 														/*IgnoreMissingAttachments*/ false,
 														/*CleanOplog*/ false,
@@ -3484,6 +3489,8 @@ TEST_CASE_TEMPLATE("project.store.export",
 	RemoteProjectStore::Result ImportForceResult = LoadOplog(CidStore,
 															 *RemoteStore,
 															 *OplogImport,
+															 NetworkPool,
+															 WorkerPool,
 															 /*Force*/ true,
 															 /*IgnoreMissingAttachments*/ false,
 															 /*CleanOplog*/ false,
@@ -3493,6 +3500,8 @@ TEST_CASE_TEMPLATE("project.store.export",
 	RemoteProjectStore::Result ImportCleanResult = LoadOplog(CidStore,
 															 *RemoteStore,
 															 *OplogImport,
+															 NetworkPool,
+															 WorkerPool,
 															 /*Force*/ false,
 															 /*IgnoreMissingAttachments*/ false,
 															 /*CleanOplog*/ true,
@@ -3502,6 +3511,8 @@ TEST_CASE_TEMPLATE("project.store.export",
 	RemoteProjectStore::Result ImportForceCleanResult = LoadOplog(CidStore,
 																  *RemoteStore,
 																  *OplogImport,
+																  NetworkPool,
+																  WorkerPool,
 																  /*Force*/ true,
 																  /*IgnoreMissingAttachments*/ false,
 																  /*CleanOplog*/ true,