some HttpClient changes eliminating some cpr helpers

1 files changed, 6 insertions, 18 deletions

diff --git a/src/zenhttp/httpclient.cpp b/src/zenhttp/httpclient.cpp
index fa290ef52..761b4b08e 100644
--- a/src/zenhttp/httpclient.cpp
+++ b/src/zenhttp/httpclient.cpp
@@ -23,11 +23,9 @@ namespace zen {
 
 using namespace std::literals;
 
-HttpClient::Response
-FromCprResponse(cpr::Response& InResponse)
-{
-	return {.StatusCode = HttpResponseCode(InResponse.status_code)};
-}
+//////////////////////////////////////////////////////////////////////////
+//
+// CPR helpers
 
 cpr::Body
 AsCprBody(const CbObject& Obj)
@@ -51,14 +49,6 @@ AsCprBody(const CompositeBuffer& Buffers)
 	return cpr::Body{std::move(String)};
 }
 
-CbObject
-AsCbObject(cpr::Response& Response)
-{
-	const std::string& Data = Response.text;
-
-	return LoadCompactBinaryObject(IoBufferBuilder::MakeCloneFromMemory(Data.data(), Data.size()));
-}
-
 //////////////////////////////////////////////////////////////////////////
 
 HttpClient::Response
@@ -213,9 +203,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 
 		for (const CbAttachment& Attachment : Attachments)
 		{
-			IoHash Hash = Attachment.GetHash();
-
-			Writer.AddHash(Hash);
+			Writer.AddHash(Attachment.GetHash());
 		}
 
 		Writer.EndArray();
@@ -233,7 +221,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 			IoBuffer ResponseBuffer(IoBuffer::Wrap, FilterResponse.text.data(), FilterResponse.text.size());
 			CbObject ResponseObject = LoadCompactBinaryObject(ResponseBuffer);
 
-			for (auto& Entry : ResponseObject["need"])
+			for (CbFieldView& Entry : ResponseObject["need"])
 			{
 				ZEN_ASSERT(Entry.IsHash());
 				AttachmentsToSend.push_back(Entry.AsHash());
@@ -272,7 +260,7 @@ HttpClient::TransactPackage(std::string_view Url, CbPackage Package)
 
 	if (!IsHttpSuccessCode(FilterResponse.status_code))
 	{
-		return FromCprResponse(FilterResponse);
+		return {.StatusCode = HttpResponseCode(FilterResponse.status_code)};
 	}
 
 	IoBuffer ResponseBuffer(IoBuffer::Clone, FilterResponse.text.data(), FilterResponse.text.size());