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

5 files changed, 20 insertions, 20 deletions

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;