Changed so CompressedBuffer::DecodeRawHash returns IoHash just like on the UE side (#208)

removed all use of IoHash::FromBLAKE3() caused by interactions with CompressedBuffer APIs

1 files changed, 27 insertions, 29 deletions

diff --git a/zenutil/cache/cacherequests.cpp b/zenutil/cache/cacherequests.cpp
index e6df4b4aa..5cbb2e04b 100644
--- a/zenutil/cache/cacherequests.cpp
+++ b/zenutil/cache/cacherequests.cpp
@@ -227,7 +227,7 @@ namespace cacherequests {
 						PutCacheRecordRequestValue& Value = Request.Values[It->second];
 						ZEN_ASSERT(Value.RawHash == ValueHash);
 						Value.Body = Attachment->AsCompressedBinary();
-						ZEN_ASSERT_SLOW(IoHash::FromBLAKE3(Value.Body.DecodeRawHash()) == Value.RawHash);
+						ZEN_ASSERT_SLOW(Value.Body.DecodeRawHash() == Value.RawHash);
 					}
 				}
 			});
@@ -268,7 +268,7 @@ namespace cacherequests {
 								const CompressedBuffer& Buffer = Value.Body;
 								if (Buffer)
 								{
-									IoHash AttachmentHash = IoHash::FromBLAKE3(Buffer.DecodeRawHash());	 // TODO: Slow!
+									IoHash AttachmentHash = Buffer.DecodeRawHash();	 // TODO: Slow!
 									Writer.AddBinaryAttachment("RawHash", AttachmentHash);
 									OutPackage.AddAttachment(CbAttachment(Buffer, AttachmentHash));
 									Writer.AddInteger("RawSize", Buffer.DecodeRawSize());  // TODO: Slow!
@@ -500,7 +500,7 @@ namespace cacherequests {
 			Writer.BeginArray("Values");
 			for (const GetCacheRecordResultValue& Value : RecordResult->Values)
 			{
-				IoHash AttachmentHash = Value.Body ? IoHash::FromBLAKE3(Value.Body.DecodeRawHash()) : Value.RawHash;
+				IoHash AttachmentHash = Value.Body ? Value.Body.DecodeRawHash() : Value.RawHash;
 				Writer.BeginObject();
 				{
 					Writer.AddObjectId("Id", Value.Id);
@@ -591,7 +591,7 @@ namespace cacherequests {
 					WriteCacheRequestKey(Writer, ValueRequest.Key);
 					if (ValueRequest.Body)
 					{
-						IoHash AttachmentHash = IoHash::FromBLAKE3(ValueRequest.Body.DecodeRawHash());
+						IoHash AttachmentHash = ValueRequest.Body.DecodeRawHash();
 						if (ValueRequest.RawHash != IoHash::Zero && AttachmentHash != ValueRequest.RawHash)
 						{
 							return false;
@@ -1041,8 +1041,8 @@ namespace cacherequests {
 
 	static bool operator==(const PutCacheRecordRequestValue& Lhs, const PutCacheRecordRequestValue& Rhs)
 	{
-		const IoHash LhsRawHash = Lhs.RawHash != IoHash::Zero ? Lhs.RawHash : IoHash::FromBLAKE3(Lhs.Body.DecodeRawHash());
-		const IoHash RhsRawHash = Rhs.RawHash != IoHash::Zero ? Rhs.RawHash : IoHash::FromBLAKE3(Rhs.Body.DecodeRawHash());
+		const IoHash LhsRawHash = Lhs.RawHash != IoHash::Zero ? Lhs.RawHash : Lhs.Body.DecodeRawHash();
+		const IoHash RhsRawHash = Rhs.RawHash != IoHash::Zero ? Rhs.RawHash : Rhs.Body.DecodeRawHash();
 		return Lhs.Id == Rhs.Id && LhsRawHash == RhsRawHash &&
 			   Lhs.Body.GetCompressed().Flatten().GetView().EqualBytes(Rhs.Body.GetCompressed().Flatten().GetView());
 	}
@@ -1312,30 +1312,30 @@ namespace cacherequests {
 		GetCacheRecordsResult FullResult = {
 			{GetCacheRecordResult{.Key	  = FullPutRequestCopy.Requests[0].Key,
 								  .Values = {{.Id	   = FullPutRequestCopy.Requests[0].Values[0].Id,
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[0].Values[0].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[0].Values[0].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[0].Values[0].Body.DecodeRawSize(),
 											  .Body	   = FullPutRequestCopy.Requests[0].Values[0].Body},
 											 {.Id = FullPutRequestCopy.Requests[0].Values[1].Id,
 
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[0].Values[1].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[0].Values[1].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[0].Values[1].Body.DecodeRawSize(),
 											  .Body	   = FullPutRequestCopy.Requests[0].Values[1].Body},
 											 {.Id	   = FullPutRequestCopy.Requests[0].Values[2].Id,
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[0].Values[2].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[0].Values[2].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[0].Values[2].Body.DecodeRawSize(),
 											  .Body	   = FullPutRequestCopy.Requests[0].Values[2].Body}}},
 			 {},  // Simulate not have!
 			 GetCacheRecordResult{.Key	  = FullPutRequestCopy.Requests[2].Key,
 								  .Values = {{.Id	   = FullPutRequestCopy.Requests[2].Values[0].Id,
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[2].Values[0].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[2].Values[0].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[2].Values[0].Body.DecodeRawSize(),
 											  .Body	   = FullPutRequestCopy.Requests[2].Values[0].Body},
 											 {.Id	   = FullPutRequestCopy.Requests[2].Values[1].Id,
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[2].Values[1].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[2].Values[1].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[2].Values[1].Body.DecodeRawSize(),
 											  .Body	   = {}},	// Simulate not have
 											 {.Id	   = FullPutRequestCopy.Requests[2].Values[2].Id,
-											  .RawHash = IoHash::FromBLAKE3(FullPutRequestCopy.Requests[2].Values[2].Body.DecodeRawHash()),
+											  .RawHash = FullPutRequestCopy.Requests[2].Values[2].Body.DecodeRawHash(),
 											  .RawSize = FullPutRequestCopy.Requests[2].Values[2].Body.DecodeRawSize(),
 											  .Body	   = FullPutRequestCopy.Requests[2].Values[2].Body}}}}};
 		CbPackage FullResponsePackage;
@@ -1368,15 +1368,15 @@ namespace cacherequests {
 			.DefaultPolicy = CachePolicy::StoreLocal,
 			.Namespace	   = "other_namespace",
 			.Requests	   = {{.Key		= {.Bucket = "finebucket", .Hash = IoHash::FromHexString("d1df59fcab06793a5f2c372d795bb907a15cab15")},
-							   .RawHash = IoHash::FromBLAKE3(Buffers[0].DecodeRawHash()),
+							   .RawHash = Buffers[0].DecodeRawHash(),
 							   .Body	= Buffers[0],
 							   .Policy	= CachePolicy::Local},
 						  {.Key		= {.Bucket = "badbucket", .Hash = IoHash::FromHexString("177030568fdd461bf4fe5ddbf4d463e514e8178e")},
-							   .RawHash = IoHash::FromBLAKE3(Buffers[1].DecodeRawHash()),
+							   .RawHash = Buffers[1].DecodeRawHash(),
 							   .Body	= Buffers[1],
 							   .Policy	= CachePolicy::Remote},
 						  {.Key		= {.Bucket = "badbucket", .Hash = IoHash::FromHexString("e1ce9e1ac8a6f5953dc14c1fa9512b804ed689df")},
-							   .RawHash = IoHash::FromBLAKE3(Buffers[2].DecodeRawHash())}}};
+							   .RawHash = Buffers[2].DecodeRawHash()}}};
 
 		CbPackage FullRequestPackage;
 		CHECK(FullRequest.Format(FullRequestPackage));
@@ -1439,13 +1439,12 @@ namespace cacherequests {
 										   {MakeCompressedBuffer(6123), MakeCompressedBuffer(8321), MakeCompressedBuffer(7333)},
 										   {MakeCompressedBuffer(5123), MakeCompressedBuffer(2321), MakeCompressedBuffer(2333)}};
 		CacheValuesResult FullResult	= {
-			   .Results = {
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][0].DecodeRawHash()), .Body = Buffers[0][0]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][1].DecodeRawHash()), .Body = Buffers[0][1]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][2].DecodeRawHash()), .Body = Buffers[0][2]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[2][0].DecodeRawHash()), .Body = Buffers[2][0]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[2][1].DecodeRawHash()), .Body = Buffers[2][1]},
-				   CacheValueResult{.RawSize = Buffers[2][2].DecodeRawSize(), .RawHash = IoHash::FromBLAKE3(Buffers[2][2].DecodeRawHash())}}};
+			   .Results = {CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][0].DecodeRawHash(), .Body = Buffers[0][0]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][1].DecodeRawHash(), .Body = Buffers[0][1]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][2].DecodeRawHash(), .Body = Buffers[0][2]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[2][0].DecodeRawHash(), .Body = Buffers[2][0]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[2][1].DecodeRawHash(), .Body = Buffers[2][1]},
+						   CacheValueResult{.RawSize = Buffers[2][2].DecodeRawSize(), .RawHash = Buffers[2][2].DecodeRawHash()}}};
 		CbPackage FullResponsePackage;
 		CHECK(FullResult.Format(FullResponsePackage));
 		CacheValuesResult FullResultCopy;
@@ -1509,13 +1508,12 @@ namespace cacherequests {
 										  {MakeCompressedBuffer(6123), MakeCompressedBuffer(8321), MakeCompressedBuffer(7333)},
 										  {MakeCompressedBuffer(5123), MakeCompressedBuffer(2321), MakeCompressedBuffer(2333)}};
 		GetCacheChunksResult FullResult	   = {
-			   .Results = {
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][0].DecodeRawHash()), .Body = Buffers[0][0]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][1].DecodeRawHash()), .Body = Buffers[0][1]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[0][2].DecodeRawHash()), .Body = Buffers[0][2]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[2][0].DecodeRawHash()), .Body = Buffers[2][0]},
-				   CacheValueResult{.RawSize = 0, .RawHash = IoHash::FromBLAKE3(Buffers[2][1].DecodeRawHash()), .Body = Buffers[2][1]},
-				   CacheValueResult{.RawSize = Buffers[2][2].DecodeRawSize(), .RawHash = IoHash::FromBLAKE3(Buffers[2][2].DecodeRawHash())}}};
+			   .Results = {CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][0].DecodeRawHash(), .Body = Buffers[0][0]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][1].DecodeRawHash(), .Body = Buffers[0][1]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[0][2].DecodeRawHash(), .Body = Buffers[0][2]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[2][0].DecodeRawHash(), .Body = Buffers[2][0]},
+						   CacheValueResult{.RawSize = 0, .RawHash = Buffers[2][1].DecodeRawHash(), .Body = Buffers[2][1]},
+						   CacheValueResult{.RawSize = Buffers[2][2].DecodeRawSize(), .RawHash = Buffers[2][2].DecodeRawHash()}}};
 		CbPackage FullResponsePackage;
 		CHECK(FullResult.Format(FullResponsePackage));
 		GetCacheChunksResult FullResultCopy;