diff options
| author | Stefan Boberg <[email protected]> | 2021-09-02 13:06:18 +0200 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2021-09-02 13:06:18 +0200 |
| commit | a57d4a96f8b9323da96d264e9e4cbbab988e1cf3 (patch) | |
| tree | 02da88ceb7b5f42a6ec9b478ed4e61d9f790157d /zencore/compactbinarypackage.cpp | |
| parent | Initial implementation of CbPackage HTTP response writing (diff) | |
| download | zen-a57d4a96f8b9323da96d264e9e4cbbab988e1cf3.tar.xz zen-a57d4a96f8b9323da96d264e9e4cbbab988e1cf3.zip | |
IoHash::HashMemory -> IoHash::HashBuffer for consistency with UE5 code
Diffstat (limited to 'zencore/compactbinarypackage.cpp')
| -rw-r--r-- | zencore/compactbinarypackage.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
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; { |