IoHash::HashMemory -> IoHash::HashBuffer for consistency with UE5 code

11 files changed, 39 insertions, 39 deletions

diff --git a/zen/chunk/chunk.cpp b/zen/chunk/chunk.cpp
index 3c54f7bac..bc1b17d2f 100644
--- a/zen/chunk/chunk.cpp
+++ b/zen/chunk/chunk.cpp
@@ -613,7 +613,7 @@ public:
 				{
 					const uint8_t*	  DataPointer = reinterpret_cast<const uint8_t*>(Buffer.Data()) + Offset;
 					const uint64_t	  DataSize	  = std::min(BytesToRead - Offset, m_ChunkSize);
-					const zen::IoHash Hash		  = zen::IoHash::HashMemory(DataPointer, DataSize);
+					const zen::IoHash Hash		  = zen::IoHash::HashBuffer(DataPointer, DataSize);
 
 					BlockHashes[(CurrentFileOffset + Offset) / m_ChunkSize] = Hash;
 
@@ -646,7 +646,7 @@ public:
 
 								if (m_CasStore)
 								{
-									const zen::IoHash CompressedHash   = zen::IoHash::HashMemory(CompressBuffer, CompressedSize);
+									const zen::IoHash CompressedHash   = zen::IoHash::HashBuffer(CompressBuffer, CompressedSize);
 									zen::IoBuffer	  CompressedData   = zen::IoBuffer(zen::IoBuffer::Wrap, CompressBuffer, CompressedSize);
 									zen::CasStore::InsertResult Result = m_CasStore->InsertChunk(CompressedData, CompressedHash);
 
@@ -678,7 +678,7 @@ public:
 
 								if (m_CasStore)
 								{
-									const zen::IoHash CompressedHash   = zen::IoHash::HashMemory(CompressBuffer, CompressedSize);
+									const zen::IoHash CompressedHash   = zen::IoHash::HashBuffer(CompressBuffer, CompressedSize);
 									zen::IoBuffer	  CompressedData   = zen::IoBuffer(zen::IoBuffer::Wrap, CompressBuffer, CompressedSize);
 									zen::CasStore::InsertResult Result = m_CasStore->InsertChunk(CompressedData, CompressedHash);
 
@@ -738,7 +738,7 @@ public:
 			for (zen::IoHash& Hash : BlockHashes)
 			{
 				const uint64_t	  DataSize = std::min(BytesToRead - Offset, m_ChunkSize);
-				const zen::IoHash CalcHash = zen::IoHash::HashMemory(FileData + Offset, DataSize);
+				const zen::IoHash CalcHash = zen::IoHash::HashBuffer(FileData + Offset, DataSize);
 
 				ZEN_ASSERT(CalcHash == Hash);
 
@@ -858,7 +858,7 @@ public:
 			Active.AddCount();	// needs fixing
 
 			Concurrency::create_task([this, Zfile, CurrentPosition, DataPointer, &Active] {
-				const zen::IoHash Hash = zen::IoHash::HashMemory(DataPointer, CurrentPosition);
+				const zen::IoHash Hash = zen::IoHash::HashBuffer(DataPointer, CurrentPosition);
 
 				const bool isNew = m_LocalHashSet.Add(Hash);
 
@@ -877,7 +877,7 @@ public:
 
 					if (m_CasStore)
 					{
-						const zen::IoHash CompressedHash = zen::IoHash::HashMemory(CompressBuffer, CompressedSize);
+						const zen::IoHash CompressedHash = zen::IoHash::HashBuffer(CompressBuffer, CompressedSize);
 						m_CasStore->InsertChunk(CompressBuffer, CompressedSize, CompressedHash);
 					}
 				}
diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index 5f3a60db9..5f16ae9d6 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -1147,7 +1147,7 @@ TEST_CASE("uson")
 		CHECK(DefaultField.GetError() == CbFieldError::None);
 
 		const uint8_t Type = (uint8_t)CbFieldType::None;
-		CHECK(DefaultField.GetHash() == IoHash::HashMemory(&Type, sizeof Type));
+		CHECK(DefaultField.GetHash() == IoHash::HashBuffer(&Type, sizeof Type));
 
 		CHECK(DefaultField.GetView() == MemoryView{});
 		MemoryView SerializedView;
@@ -1179,7 +1179,7 @@ TEST_CASE("uson")
 		CHECK(NoneField.GetName().compare("Name"sv) == 0);
 		CHECK(NoneField.HasName() == true);
 		CHECK(NoneField.HasValue() == false);
-		CHECK(NoneField.GetHash() == IoHash::HashMemory(NoneBytes, sizeof NoneBytes));
+		CHECK(NoneField.GetHash() == IoHash::HashBuffer(NoneBytes, sizeof NoneBytes));
 		CHECK(NoneField.GetView() == MemoryView(NoneBytes, sizeof NoneBytes));
 		MemoryView SerializedView;
 		CHECK(NoneField.TryGetSerializedView(SerializedView) == true);
@@ -1216,7 +1216,7 @@ TEST_CASE("uson")
 		CHECK(NoneField.GetName().compare("Name") == 0);
 		CHECK(NoneField.HasName() == true);
 		CHECK(NoneField.HasValue() == false);
-		CHECK(NoneField.GetHash() == IoHash::HashMemory(NoneBytes, sizeof NoneBytes));
+		CHECK(NoneField.GetHash() == IoHash::HashBuffer(NoneBytes, sizeof NoneBytes));
 		CHECK(NoneField.GetView() == MemoryView(&NoneBytes[1], sizeof NoneBytes - 1));
 		MemoryView SerializedView;
 		CHECK(NoneField.TryGetSerializedView(SerializedView) == false);
@@ -1235,7 +1235,7 @@ TEST_CASE("uson")
 		CHECK(NoneField.GetName().empty() == true);
 		CHECK(NoneField.HasName() == true);
 		CHECK(NoneField.HasValue() == false);
-		CHECK(NoneField.GetHash() == IoHash::HashMemory(NoneBytes, sizeof NoneBytes));
+		CHECK(NoneField.GetHash() == IoHash::HashBuffer(NoneBytes, sizeof NoneBytes));
 		CHECK(NoneField.GetView() == MemoryView(&NoneBytes[1], sizeof NoneBytes - 1));
 		MemoryView SerializedView;
 		CHECK(NoneField.TryGetSerializedView(SerializedView) == false);
@@ -1264,7 +1264,7 @@ TEST_CASE("uson.null")
 		CHECK(NullField.HasError() == false);
 		CHECK(NullField.GetError() == CbFieldError::None);
 		const uint8_t Null[]{uint8_t(CbFieldType::Null)};
-		CHECK(NullField.GetHash() == IoHash::HashMemory(Null, sizeof Null));
+		CHECK(NullField.GetHash() == IoHash::HashBuffer(Null, sizeof Null));
 	}
 
 	SUBCASE("CbField(None)")
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp
index c4df54616..92ec3789d 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/zencore/compactbinarypackage.cpp
@@ -100,7 +100,7 @@ CbAttachment::TryLoad(CbFieldIterator& Fields)
 		}
 		else
 		{
-			Hash = IoHash::HashMemory(MemoryView{});
+			Hash = IoHash::HashBuffer(MemoryView{});
 		}
 		Value.emplace<CbObjectValue>(CbObject(ObjectView, Fields->GetOuterBuffer()), Hash);
 	}
@@ -148,7 +148,7 @@ CbAttachment::TryLoad(BinaryReader& Reader, BufferAllocator Allocator)
 		}
 		else
 		{
-			Hash = IoHash::HashMemory(MemoryView());
+			Hash = IoHash::HashBuffer(MemoryView());
 		}
 		Value.emplace<CbObjectValue>(CbObject(ObjectView, Field.GetOuterBuffer()), Hash);
 	}
@@ -213,7 +213,7 @@ CbAttachment::GetHash() const
 {
 	if (const CompressedBuffer* Buffer = std::get_if<CompressedBuffer>(&Value))
 	{
-		return Buffer->IsNull() ? IoHash::HashMemory(MemoryView()) : IoHash::FromBLAKE3(Buffer->GetRawHash());
+		return Buffer->IsNull() ? IoHash::HashBuffer(MemoryView()) : IoHash::FromBLAKE3(Buffer->GetRawHash());
 	}
 	else
 	{
@@ -581,7 +581,7 @@ TEST_CASE("usonpackage")
 		CHECK_FALSE(bool(Attachment.AsObject()));
 		CHECK(Attachment.IsBinary());
 		CHECK_FALSE(Attachment.IsObject());
-		CHECK(Attachment.GetHash() == IoHash::HashMemory(Buffer));
+		CHECK(Attachment.GetHash() == IoHash::HashBuffer(Buffer));
 		TestSaveLoadValidate("Binary", Attachment);
 	}
 
@@ -615,7 +615,7 @@ TEST_CASE("usonpackage")
 		CHECK_FALSE(bool(Attachment.AsObject()));
 		CHECK(Attachment.IsBinary());
 		CHECK_FALSE(Attachment.IsObject());
-		CHECK(Attachment.GetHash() == IoHash::HashMemory(Buffer));
+		CHECK(Attachment.GetHash() == IoHash::HashBuffer(Buffer));
 	}
 
 	SUBCASE("Object View")
@@ -657,7 +657,7 @@ TEST_CASE("usonpackage")
 		CHECK_FALSE(Attachment.AsObject());
 		CHECK(Attachment.IsBinary());
 		CHECK_FALSE(Attachment.IsObject());
-		CHECK(Attachment.GetHash() == IoHash::HashMemory(MakeMemoryView(Value)));
+		CHECK(Attachment.GetHash() == IoHash::HashBuffer(MakeMemoryView(Value)));
 	}
 
 	SUBCASE("Object Load from View")
@@ -696,7 +696,7 @@ TEST_CASE("usonpackage")
 		CHECK(Attachment.IsNull());
 		CHECK_FALSE(Attachment.IsBinary());
 		CHECK_FALSE(Attachment.IsObject());
-		CHECK(Attachment.GetHash() == IoHash::HashMemory(SharedBuffer{}));
+		CHECK(Attachment.GetHash() == IoHash::HashBuffer(SharedBuffer{}));
 	}
 
 	SUBCASE("Binary Empty")
@@ -706,7 +706,7 @@ TEST_CASE("usonpackage")
 		CHECK_FALSE(Attachment.IsNull());
 		CHECK(Attachment.IsBinary());
 		CHECK_FALSE(Attachment.IsObject());
-		CHECK(Attachment.GetHash() == IoHash::HashMemory(SharedBuffer{}));
+		CHECK(Attachment.GetHash() == IoHash::HashBuffer(SharedBuffer{}));
 	}
 
 	SUBCASE("Object Empty")
@@ -851,7 +851,7 @@ TEST_CASE("usonpackage.serialization")
 	// Shared Values
 	const uint8_t Level4Values[]{0, 1, 2, 3};
 	SharedBuffer  Level4	 = SharedBuffer::MakeView(MakeMemoryView(Level4Values));
-	const IoHash  Level4Hash = IoHash::HashMemory(Level4);
+	const IoHash  Level4Hash = IoHash::HashBuffer(Level4);
 
 	CbObject Level3;
 	{
diff --git a/zencore/compactbinaryvalidation.cpp b/zencore/compactbinaryvalidation.cpp
index 87455860c..ec8cd0f96 100644
--- a/zencore/compactbinaryvalidation.cpp
+++ b/zencore/compactbinaryvalidation.cpp
@@ -436,7 +436,7 @@ ValidateCbPackageAttachment(CbFieldView& Value, MemoryView& View, CbValidateMode
 					AddError(Error, CbValidateError::InvalidPackageFormat);
 				}
 				if (EnumHasAnyFlags(Mode, CbValidateMode::PackageHash) &&
-					(IoHash::FromBLAKE3(Buffer.GetRawHash()) != IoHash::HashMemory(Buffer.DecompressToComposite())))
+					(IoHash::FromBLAKE3(Buffer.GetRawHash()) != IoHash::HashBuffer(Buffer.DecompressToComposite())))
 				{
 					AddError(Error, CbValidateError::InvalidPackageHash);
 				}
diff --git a/zencore/include/zencore/iohash.h b/zencore/include/zencore/iohash.h
index 853076129..475bfe447 100644
--- a/zencore/include/zencore/iohash.h
+++ b/zencore/include/zencore/iohash.h
@@ -41,9 +41,9 @@ struct IoHash
 		return Io;
 	}
 
-	static IoHash	   HashMemory(const void* data, size_t byteCount);
-	static IoHash	   HashMemory(MemoryView Data) { return HashMemory(Data.GetData(), Data.GetSize()); }
-	static IoHash	   HashMemory(const CompositeBuffer& Buffer);
+	static IoHash	   HashBuffer(const void* data, size_t byteCount);
+	static IoHash	   HashBuffer(MemoryView Data) { return HashBuffer(Data.GetData(), Data.GetSize()); }
+	static IoHash	   HashBuffer(const CompositeBuffer& Buffer);
 	static IoHash	   FromHexString(const char* string);
 	static IoHash	   FromHexString(const std::string_view string);
 	const char*		   ToHexString(char* outString /* 40 characters + NUL terminator */) const;
diff --git a/zencore/iohash.cpp b/zencore/iohash.cpp
index 9b095ccdb..2b9bec120 100644
--- a/zencore/iohash.cpp
+++ b/zencore/iohash.cpp
@@ -14,7 +14,7 @@ namespace zen {
 IoHash IoHash::Zero;  // Initialized to all zeros
 
 IoHash
-IoHash::HashMemory(const void* data, size_t byteCount)
+IoHash::HashBuffer(const void* data, size_t byteCount)
 {
 	BLAKE3 b3 = BLAKE3::HashMemory(data, byteCount);
 
@@ -25,7 +25,7 @@ IoHash::HashMemory(const void* data, size_t byteCount)
 }
 
 IoHash
-IoHash::HashMemory(const CompositeBuffer& Buffer)
+IoHash::HashBuffer(const CompositeBuffer& Buffer)
 {
 	IoHashStream Hasher;
 
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 67d4e95cd..8850e729e 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -847,7 +847,7 @@ TEST_CASE("cas.basic")
 			body.resize(ChunkSize, ' ');
 
 			ChunkSizes[i]  = ChunkSize;
-			ChunkHashes[i] = zen::IoHash::HashMemory(body.data(), body.size());
+			ChunkHashes[i] = zen::IoHash::HashBuffer(body.data(), body.size());
 
 			cli.SetBody(body);
 
@@ -870,7 +870,7 @@ TEST_CASE("cas.basic")
 			CHECK(res.status_code == 200);
 			CHECK(res.text.size() == ChunkSizes[i]);
 
-			zen::IoHash Hash = zen::IoHash::HashMemory(res.text.data(), res.text.size());
+			zen::IoHash Hash = zen::IoHash::HashBuffer(res.text.data(), res.text.size());
 
 			CHECK(ChunkHashes[i] == Hash);
 
@@ -903,7 +903,7 @@ TEST_CASE("cas.basic")
 			CHECK(res.status_code == 200);
 			CHECK(res.text.size() == ChunkSizes[i]);
 
-			zen::IoHash Hash = zen::IoHash::HashMemory(res.text.data(), res.text.size());
+			zen::IoHash Hash = zen::IoHash::HashBuffer(res.text.data(), res.text.size());
 
 			CHECK(ChunkHashes[i] == Hash);
 		}
@@ -1096,7 +1096,7 @@ TEST_CASE("z$.basic")
 	const int  kIterationCount = 100;
 	const auto BaseUri		   = "http://localhost:{}/z$"_format(PortNumber);
 
-	auto HashKey = [](int i) -> zen::IoHash { return zen::IoHash::HashMemory(&i, sizeof i); };
+	auto HashKey = [](int i) -> zen::IoHash { return zen::IoHash::HashBuffer(&i, sizeof i); };
 
 	{
 		ZenServerInstance Instance1(TestEnv);
@@ -1128,7 +1128,7 @@ TEST_CASE("z$.basic")
 
 		for (int i = 0; i < kIterationCount; ++i)
 		{
-			zen::IoHash Key = zen::IoHash::HashMemory(&i, sizeof i);
+			zen::IoHash Key = zen::IoHash::HashBuffer(&i, sizeof i);
 
 			cpr::Response Result = cpr::Get(cpr::Url{"{}/{}/{}"_format(BaseUri, "test", Key)});
 
diff --git a/zenserver/cache/structuredcache.cpp b/zenserver/cache/structuredcache.cpp
index 1e3eb5dcd..94ca52164 100644
--- a/zenserver/cache/structuredcache.cpp
+++ b/zenserver/cache/structuredcache.cpp
@@ -391,7 +391,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
 						if (zen::CompressedBuffer Compressed = zen::CompressedBuffer::FromCompressed(SharedBuffer(UpstreamResult.Payload)))
 						{
 							Payload								  = UpstreamResult.Payload;
-							zen::IoHash					ChunkHash = zen::IoHash::HashMemory(Payload);
+							zen::IoHash					ChunkHash = zen::IoHash::HashBuffer(Payload);
 							zen::CasStore::InsertResult Result	  = m_CasStore.InsertChunk(Payload, ChunkHash);
 
 							m_CidStore.AddCompressedCid(Ref.PayloadId, ChunkHash);
@@ -440,7 +440,7 @@ HttpStructuredCacheService::HandleCachePayloadRequest(zen::HttpServerRequest& Re
 						return Request.WriteResponse(zen::HttpResponse::BadRequest, HttpContentType::kText, "Empty payload not permitted");
 					}
 
-					zen::IoHash ChunkHash = zen::IoHash::HashMemory(Body);
+					zen::IoHash ChunkHash = zen::IoHash::HashBuffer(Body);
 
 					zen::CompressedBuffer Compressed = zen::CompressedBuffer::FromCompressed(SharedBuffer(Body));
 
diff --git a/zenserver/casstore.cpp b/zenserver/casstore.cpp
index 2560659ec..1d147024a 100644
--- a/zenserver/casstore.cpp
+++ b/zenserver/casstore.cpp
@@ -84,7 +84,7 @@ HttpCasService::HttpCasService(CasStore& Store) : m_CasStore(Store)
 				case HttpVerb::kPut:
 					{
 						IoBuffer Payload	 = ServerRequest.ReadPayload();
-						IoHash	 PayloadHash = IoHash::HashMemory(Payload.Data(), Payload.Size());
+						IoHash	 PayloadHash = IoHash::HashBuffer(Payload.Data(), Payload.Size());
 
 						// URI hash must match content hash
 						if (PayloadHash != Hash)
@@ -121,7 +121,7 @@ HttpCasService::HandleRequest(zen::HttpServerRequest& Request)
 			case HttpVerb::kPost:
 				{
 					IoBuffer Payload	 = Request.ReadPayload();
-					IoHash	 PayloadHash = IoHash::HashMemory(Payload.Data(), Payload.Size());
+					IoHash	 PayloadHash = IoHash::HashBuffer(Payload.Data(), Payload.Size());
 
 					spdlog::debug("CAS POST request for {} ({} bytes)", PayloadHash, Payload.Size());
 
diff --git a/zenserver/projectstore.cpp b/zenserver/projectstore.cpp
index 1785aad9e..33d008f3e 100644
--- a/zenserver/projectstore.cpp
+++ b/zenserver/projectstore.cpp
@@ -1336,7 +1336,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
 			if (std::string_view SaltParam = Params.GetValue("salt"); SaltParam.empty() == false)
 			{
 				const uint32_t Salt = std::stoi(std::string(SaltParam));
-				SaltHash			= IoHash::HashMemory(&Salt, sizeof Salt);
+				SaltHash			= IoHash::HashBuffer(&Salt, sizeof Salt);
 				IsUsingSalt			= true;
 			}
 
@@ -1364,7 +1364,7 @@ HttpProjectService::HttpProjectService(CasStore& Store, ProjectStore* Projects)
 				if (IsUsingSalt)
 				{
 					IoHash AttachmentSpec[]{SaltHash, Hash};
-					AttachmentId = IoHash::HashMemory(MakeMemoryView(AttachmentSpec));
+					AttachmentId = IoHash::HashBuffer(MakeMemoryView(AttachmentSpec));
 				}
 				else
 				{
diff --git a/zenserver/upstream/jupiter.cpp b/zenserver/upstream/jupiter.cpp
index 4a879b233..a59b9d317 100644
--- a/zenserver/upstream/jupiter.cpp
+++ b/zenserver/upstream/jupiter.cpp
@@ -187,7 +187,7 @@ CloudCacheSession::GetCompressedBlob(const IoHash& Key)
 CloudCacheResult
 CloudCacheSession::PutDerivedData(std::string_view BucketId, std::string_view Key, IoBuffer DerivedData)
 {
-	IoHash Hash = IoHash::HashMemory(DerivedData.Data(), DerivedData.Size());
+	IoHash Hash = IoHash::HashBuffer(DerivedData.Data(), DerivedData.Size());
 
 	std::string Auth;
 	m_CacheClient->AcquireAccessToken(Auth);
@@ -217,7 +217,7 @@ CloudCacheSession::PutDerivedData(std::string_view BucketId, const IoHash& Key,
 CloudCacheResult
 CloudCacheSession::PutRef(std::string_view BucketId, const IoHash& Key, IoBuffer Ref)
 {
-	IoHash Hash = IoHash::HashMemory(Ref.Data(), Ref.Size());
+	IoHash Hash = IoHash::HashBuffer(Ref.Data(), Ref.Size());
 
 	std::string Auth;
 	m_CacheClient->AcquireAccessToken(Auth);